|
@@ -2776,7 +2776,7 @@ class CropCount_View(ListView):
|
|
|
time_now = int(timezone.now().strftime("%Y%m%d"))
|
|
time_now = int(timezone.now().strftime("%Y%m%d"))
|
|
|
data = time_now-time
|
|
data = time_now-time
|
|
|
print(data)
|
|
print(data)
|
|
|
- curro = ""
|
|
|
|
|
|
|
+ curro = ""
|
|
|
h2 = {"cropname":x.cropname,
|
|
h2 = {"cropname":x.cropname,
|
|
|
"area":x.area.name,
|
|
"area":x.area.name,
|
|
|
"crop_count":x.crop_count,
|
|
"crop_count":x.crop_count,
|
|
@@ -2785,7 +2785,7 @@ class CropCount_View(ListView):
|
|
|
"id":x.id,
|
|
"id":x.id,
|
|
|
"upl_time":x.upl_time.strftime('%Y-%m-%d'),
|
|
"upl_time":x.upl_time.strftime('%Y-%m-%d'),
|
|
|
"crop_img":x.crop_img,
|
|
"crop_img":x.crop_img,
|
|
|
- }
|
|
|
|
|
|
|
+ }
|
|
|
dat.append({"data":h2,"curro":curro})
|
|
dat.append({"data":h2,"curro":curro})
|
|
|
nums = len(dat)
|
|
nums = len(dat)
|
|
|
dat = dat[(9*(page-1)):(page*9)]
|
|
dat = dat[(9*(page-1)):(page*9)]
|
|
@@ -3503,6 +3503,7 @@ class Area_Create(ListView):
|
|
|
currpage = request.GET.get('currpage')
|
|
currpage = request.GET.get('currpage')
|
|
|
uname = request.GET.get("uname")
|
|
uname = request.GET.get("uname")
|
|
|
f_name = request.GET.get("f_name")
|
|
f_name = request.GET.get("f_name")
|
|
|
|
|
+ c_id = request.GET.get("id")
|
|
|
user_obj = MyUser.objects.get(username=uname)
|
|
user_obj = MyUser.objects.get(username=uname)
|
|
|
try:
|
|
try:
|
|
|
curr_area = GardenArea.objects.get(user=user_obj)
|
|
curr_area = GardenArea.objects.get(user=user_obj)
|
|
@@ -3511,7 +3512,7 @@ class Area_Create(ListView):
|
|
|
print(e)
|
|
print(e)
|
|
|
curr_area = ""
|
|
curr_area = ""
|
|
|
# user_area = {"name":"","location":""}
|
|
# user_area = {"name":"","location":""}
|
|
|
- return render(request, 'backstageNet/systemSet/onlineSplit.html', context={"currpage":currpage,"uname":uname,"f_name":f_name,"curr_area":curr_area})
|
|
|
|
|
|
|
+ return render(request, 'backstageNet/systemSet/onlineSplit.html', context={"currpage":currpage,"uname":uname,"f_name":f_name,"curr_area":curr_area,"id":c_id})
|
|
|
def post(self,request):
|
|
def post(self,request):
|
|
|
uname = request.POST.get("uname")
|
|
uname = request.POST.get("uname")
|
|
|
name = request.POST.get("name")
|
|
name = request.POST.get("name")
|