NEWCT-9P force field

[django_unres.git] / django_simple / todo / views.py

diff --git a/django_simple/todo/views.py b/django_simple/todo/views.py
index d38312f..092b9bd 100644 (file)
--- a/django_simple/todo/views.py
+++ b/django_simple/todo/views.py
@@ -161,8 +161,9 @@ def index(request):
     user = request.user
     tasks = Task.objects.filter(owner=user).order_by('-created_date')
     variable = ''
+    tasks_count = Task.objects.filter(owner=user).count()
     return render(request, "index.html", {
-            'tasks': tasks, 'alldone': 0
+            'tasks': tasks, 'alldone': 0, 'tasks_count':tasks_count
         })
 
 @login_required
@@ -293,6 +294,8 @@ def add_md(request,task_id):
              task.md_temp=form.cleaned_data["md_temp"]
              task.md_nstep=form.cleaned_data["md_nstep"]
              task.md_total_steps=task.md_nstep
+             if task.md_nstep<250000:
+                 task.md_ntwx=100
 
              basename = str(task.owner)
              suffix = datetime.datetime.now().strftime("%y%m%d_%H%M%S")
@@ -989,6 +992,7 @@ def refresh_done1(request, task_id):
 def refresh_done(request):
     user = request.user
     tasks = Task.objects.filter(owner=user).order_by('-created_date')
+    tasks_count = Task.objects.filter(owner=user).count()
     alldone = 1
     for task in tasks:
       refresh_done0(task)
@@ -1012,7 +1016,8 @@ def refresh_done(request):
      return render(request, "index.html", {
                 'tasks': tasks ,
                 'variable' : variable,
-                'alldone': alldone
+                'alldone': alldone,
+                'tasks_count':tasks_count
                         })
 
       
@@ -1110,15 +1115,15 @@ def refresh_done0(task):
                   if i>6:
                        break
                   if i==1:
-                     task.remd_model1=task.remd_model1+' Cluster1 probability= '+line1.split()[2]
+                     task.remd_model1=task.remd_model1+' Cluster1 probability= '+line1.split()[-2]
                   elif i==2:
-                     task.remd_model2=task.remd_model2+' Cluster2 probability= '+line1.split()[2]
+                     task.remd_model2=task.remd_model2+' Cluster2 probability= '+line1.split()[-2]
                   elif i==3:
-                     task.remd_model3=task.remd_model3+' Cluster3 probability= '+line1.split()[2]
+                     task.remd_model3=task.remd_model3+' Cluster3 probability= '+line1.split()[-2]
                   elif i==4:
-                     task.remd_model4=task.remd_model4+' Cluster4 probability= '+line1.split()[2]
+                     task.remd_model4=task.remd_model4+' Cluster4 probability= '+line1.split()[-2]
                   elif i==5:
-                     task.remd_model5=task.remd_model5+' Cluster5 probability= '+line1.split()[2]
+                     task.remd_model5=task.remd_model5+' Cluster5 probability= '+line1.split()[-2]
                      
          
 
@@ -1156,3 +1161,24 @@ def refresh_done0(task):
 
     
       return  
+
+@login_required
+def zip_all_files(request, task_id):
+    import os, zipfile
+    from django.http import HttpResponse
+    from wsgiref.util import FileWrapper
+    from django.core.files.temp import NamedTemporaryFile
+
+    task = get_object_or_404(Task, id=task_id)
+
+    temp=NamedTemporaryFile()
+    archive = zipfile.ZipFile(temp, 'w', zipfile.ZIP_DEFLATED)
+    for (dirpath, dirnames, filenames) in os.walk(task.jobdirname):
+       for file1 in filenames:
+         archive.write(dirpath+"/"+file1,file1)
+    archive.close()
+    temp.seek(0)
+    wrapper = FileWrapper(temp)
+    response = HttpResponse(wrapper, content_type='application/zip')
+    response['Content-Disposition'] = 'attachment; filename=all.zip'
+    return response