From: Cezary Czaplewski <czarek@chem.univ.gda.pl>
Date: Wed, 11 Apr 2018 12:01:52 +0000 (+0200)
Subject: restart for lazyuser details1
X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=commitdiff_plain;h=521c866952798209eb432cc8f39434b04eeb56bf;p=django_unres.git

restart for lazyuser details1
---

diff --git a/django_simple/todo/templates/details1.html b/django_simple/todo/templates/details1.html
index e375b92..9bb24f7 100644
--- a/django_simple/todo/templates/details1.html
+++ b/django_simple/todo/templates/details1.html
@@ -43,6 +43,18 @@ Created {{ task.created_date  }}
 			  	<div class="col-md-8">
 		  			{% if task.done %}
 			  			<span class="fa fa-check-square-o"></span>
+			  	            {% if task.type == "md" or task.type == "remd" %}
+			  	              <form action="restart/"
+			  			method="get"
+			  			style="text-align;float:right;">
+			  			{% csrf_token %}
+			  			 <input type="submit" 
+			  			 class="btn btn-default" 
+			  			 value="Restart"
+			  			 name="restartbtn">
+			  			 </button>
+                                              </form>
+                                            {% endif %}  
 					{% else %}
 					  {% if task.running > 0  %}
 			  			<span class="fa fa-spinner
@@ -165,6 +177,10 @@ Created {{ task.created_date  }}
 		 	    <div class="col-md-6">{{ task.md_nstep}}</div>
 			</li>		
 		        <li class="list-group-item task-item">
+		            <div class="col-md-6"> total steps (with restarts) </div>
+		 	    <div class="col-md-6">{{ task.md_total_steps}}</div>
+			</li>		
+		        <li class="list-group-item task-item">
 		            <div class="col-md-6"> ntwe </div>
 		 	    <div class="col-md-6">{{ task.md_ntwe}}</div>
 			</li>		
@@ -251,6 +267,10 @@ Created {{ task.created_date  }}
 		 	    <div class="col-md-6">{{ task.md_nstep}}</div>
 			</li>		
 		        <li class="list-group-item task-item">
+		            <div class="col-md-6"> total steps (with restarts) </div>
+		 	    <div class="col-md-6">{{ task.md_total_steps}}</div>
+			</li>		
+		        <li class="list-group-item task-item">
 		            <div class="col-md-6"> ntwe </div>
 		 	    <div class="col-md-6">{{ task.md_ntwe}}</div>
 			</li>		
@@ -416,7 +436,8 @@ Created {{ task.created_date  }}
 			    <div class="col-md-2"> Movie </div>
 			    <div class="col-md-10"> 
 
-                            <video width="500" height="400" preload controls>
+                            <video width="500" height="400"
+                            preload="auto" controls="controls">
                             <source
                             src="/myfiles/download-file/{{task.jobdirname}}/md.ogv"
                             type="video/ogg; codecs=theora"> </source>
@@ -434,7 +455,7 @@ Created {{ task.created_date  }}
 			</li>
                         <li class="list-group-item task-item">
                <div class="col-md-6">
-<input id="clipRange" type="range" value=0 min=0 max= {% widthratio task.md_nstep task.md_ntwx 1 %} step=1 ></input><span id="clipRange_val">0</span> frame
+<input id="clipRange" type="range" value=0 min=0 max= {% widthratio task.md_total_steps task.md_ntwx 1 %} step=1 ></input><span id="clipRange_val">0</span> frame
 </div>
 <div class="col-md-6">
 <button id="toggleRunMDs">run/pause MD</button>  
diff --git a/django_simple/todo/urls.py b/django_simple/todo/urls.py
index 8f9d702..fd3c4f1 100644
--- a/django_simple/todo/urls.py
+++ b/django_simple/todo/urls.py
@@ -21,5 +21,6 @@ urlpatterns = [
         url(r'^details/(?P<task_id>\d+)/$', views.details,name='details'),
         url(r'^details/(?P<task_id>\d+)/restart/$', views.restart,name='restart'),        
         url(r'^details1/(?P<user_id>\w+)/(?P<task_id>\d+)/$', views.details1,name='details1'),        
+        url(r'^details1/(?P<user_id>\w+)/(?P<task_id>\d+)/restart/$', views.restart1,name='restart1'),        
 	url(r'^delete/(?P<task_id>\d+)/$', views.delete),
 ]
diff --git a/django_simple/todo/views.py b/django_simple/todo/views.py
index d9525b0..e1ac2b0 100644
--- a/django_simple/todo/views.py
+++ b/django_simple/todo/views.py
@@ -904,10 +904,14 @@ def details1(request,user_id,task_id):
 def delete(request, task_id):
     Task.objects.get(id=task_id).delete()
     return redirect('/')
-
+    
 @login_required
 def restart(request, task_id):
     task = get_object_or_404(Task, id=task_id)
+    restart0(task)
+    return redirect('/')
+    
+def restart0(task):    
     if os.path.isfile(task.jobdirname+'/finished'):    
       os.remove(task.jobdirname+'/finished')
     task.running =1
@@ -940,8 +944,14 @@ def restart(request, task_id):
       os.rename('file_wham.tmp','file_wham.inp')
       ret_code = subprocess.Popen(' /opt/torque/bin/qsub pbs8.csh', shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)            
       os.chdir('..')
-    return redirect('/')
+    return
 
+def restart1(request, user_id, task_id):
+    task = get_object_or_404(Task, id=task_id)
+    user = task.owner
+    restart0(task)
+    return redirect('/details1/'+str(user)+'/'+str(task.id)+'/')
+    
 
 def refresh_done1(request, task_id):
     task = get_object_or_404(Task, id=task_id)