From 73008923acaf643aab7d5af2b559831ff0529489 Mon Sep 17 00:00:00 2001
From: Cezary Czaplewski <czarek@chem.univ.gda.pl>
Date: Sat, 18 Nov 2017 00:29:37 +0100
Subject: [PATCH] link/refresh single lazy job

---
 .../templates/registration/login.html              |    5 +-
 django_simple/todo/templates/base.html             |   13 +-
 django_simple/todo/templates/details1.html         |  528 ++++++++++++++++++++
 django_simple/todo/urls.py                         |    2 +
 django_simple/todo/views.py                        |   81 ++-
 5 files changed, 599 insertions(+), 30 deletions(-)
 create mode 100644 django_simple/todo/templates/details1.html

diff --git a/django_simple/authentication/templates/registration/login.html b/django_simple/authentication/templates/registration/login.html
index dd03f80..ac40b5f 100644
--- a/django_simple/authentication/templates/registration/login.html
+++ b/django_simple/authentication/templates/registration/login.html
@@ -3,6 +3,7 @@
 
 {% block content %}
 
+
 Run a single job without login.
 
 		<li class="list-group-item new-task-item task-item">
@@ -23,7 +24,8 @@ Run a single job without login.
 
 
 <hr>
-Register and login to save many jobs.
+{% if user.is_anonymous %}
+Register/login to run and save multiple jobs (optional).
 
 <form method="post" action=".">
   {% csrf_token %} 
@@ -35,4 +37,5 @@ Register and login to save many jobs.
 
 <p>{% trans "Forgot password" %}? <a href="{% url 'auth_password_reset' %}">{% trans "Reset it" %}</a>!</p>
 <p>{% trans "Not member" %}? <a href="{% url 'registration_register' %}">{% trans "Register" %}</a>!</p>
+{% endif %}
 {% endblock %}
diff --git a/django_simple/todo/templates/base.html b/django_simple/todo/templates/base.html
index c85301a..b131d87 100644
--- a/django_simple/todo/templates/base.html
+++ b/django_simple/todo/templates/base.html
@@ -19,8 +19,11 @@
 <div class="col-sm-6 col-sm-offset-3">
 	
 	<div class="page-header">
+	 {% if not user|is_lazy_user %}
 	  <h1><a href="/">UNRES server</a> <small> (beta version with debug)</small></h1>
-
+         {% else %}
+          <h1>UNRES server <small> (beta version with debug)</small></h1>          
+         {% endif %}
               Lab. of Simul. of Polym. & Lab. of Mol. Model, Faculty of Chemistry, University of Gdansk
               <br>
               Ver.11.11.2017 <span class="fa fa-envelope-o"></span> 
@@ -28,12 +31,14 @@
 
 		<div class="user-name">
 		  	{% if not user.is_anonymous %}
-		  		<strong>Logged as:&nbsp;</strong> {{user}} &nbsp;
+
 		  	  {% if user|is_lazy_user %}
-		  	        <a href="/logout" title="Log out and delete data"><span class="fa fa-sign-out"></span></a>
+		  	  <strong>Return to job submission page&nbsp;</strong>&nbsp;
+                          <a href="/logout" title="next job"><span class="fa fa-sign-out"></span></a>
 		  	  {% else %}
+		  		<strong>Logged as:&nbsp;</strong> {{user}} &nbsp;		  	  
 				<a href="/logout" title="Log out"><span class="fa fa-sign-out"></span></a>
-			{% endif %}	
+			  {% endif %}	
 			{% endif %}
 		</div>
 <!--
diff --git a/django_simple/todo/templates/details1.html b/django_simple/todo/templates/details1.html
new file mode 100644
index 0000000..911496c
--- /dev/null
+++ b/django_simple/todo/templates/details1.html
@@ -0,0 +1,528 @@
+{% extends "base.html" %}
+
+{% load i18n lazysignup_tags %}
+{% block content %}
+
+<ul class="list-group">
+
+<li class="list-group-item new-task-item task-item">
+
+<div class="col-xs-3 form-group">
+<form action="/refresh_done1/{{task.id}}/" method="post">
+{% csrf_token %}
+<input type="submit" class="btn" value="Refresh" name="refreshbtn">
+</form>
+</div>
+
+<div class="col-xs-10 form-group">
+<h5 style="text-align:right;float:right;">
+{% if not task.done %}
+ {% if task.running > 0  %}
+  {% if task.running == 100  %}
+  postprocessing
+  {% else %}
+  running
+  {% endif %}
+ {% else %}
+  waiting in the queue to start
+ {% endif %}
+{% endif %}
+</h5>
+</div>
+</li>
+</ul>
+
+<h3> All parameters for task <b>{{ task.name }}</b></h3>
+Created {{ task.created_date  }}
+	<ul class="list-group">
+
+			<li class="list-group-item task-item">
+			        <div class="col-xs-10"> done ?</div>
+			  	<div class="col-xs-10">
+		  			{% if task.done %}
+			  			<span class="fa fa-check-square-o"></span>
+					{% else %}
+					  {% if task.running > 0  %}
+			  			<span class="fa fa-spinner
+			  			fa-spin"></span>
+			  			{{ task.running }}%
+			                  {% else %}
+			  			<span class="fa fa-square-o"></span>
+			  		  {% endif %}
+					{% endif %}
+
+			  	</div>
+			</li>  	
+		        <li class="list-group-item task-item">
+		            <div class="col-xs-10"> type </div>
+		 	    <div class="col-xs-10">{{ task.type }}</div>
+			</li>		
+         
+         	        <li class="list-group-item task-item">
+		            <div class="col-xs-10"> force field </div>
+		 	    <div class="col-xs-10">{{ task.unres_ff }}</div>
+			</li>		
+
+		        <li class="list-group-item task-item">
+		            <div class="col-xs-10"> sequence </div>
+		 	    <div class="col-xs-10">{{ task.md_seq}}</div>
+			</li>		
+
+		        <li class="list-group-item task-item">
+		            <div class="col-xs-10"> SSBOND </div>
+		 	    <div class="col-xs-10">{{ task.ssbond}}</div>
+			</li>		
+
+			
+	{% if task.type == "min" %}
+
+
+		        <li class="list-group-item task-item">
+		            <div class="col-xs-10"> algorithm</div>
+		 	    <div class="col-xs-10">{{ task.min_choice }}</div>
+			</li>		
+		        <li class="list-group-item task-item">
+		            <div class="col-xs-10"> overlap</div>
+		 	    <div class="col-xs-10">{{ task.min_overlap }}</div>
+			</li>		
+		        <li class="list-group-item task-item">
+		            <div class="col-xs-10"> searchsc</div>
+		 	    <div class="col-xs-10">{{ task.min_searchsc }}</div>
+			</li>		
+		        <li class="list-group-item task-item">
+		            <div class="col-xs-10"> maxmin</div>
+		 	    <div class="col-xs-10">{{ task.min_maxmin }}</div>
+			</li>		
+		        <li class="list-group-item task-item">
+		            <div class="col-xs-10"> maxfun</div>
+		 	    <div class="col-xs-10">{{ task.min_maxfun }}</div>
+			</li>		
+		        <li class="list-group-item task-item">
+		            <div class="col-xs-10"> pdbout</div>
+		 	    <div class="col-xs-10">{{ task.min_pdbout }}</div>
+			</li>		
+		        <li class="list-group-item task-item">
+		            <div class="col-xs-10"> input pdb </div>
+		 	    <div class="col-xs-10">{{ task.myfile1 }}</div>
+			</li>		
+		        <li class="list-group-item task-item">
+		            <div class="col-xs-10"> unres_pdb</div>
+		 	    <div class="col-xs-10">{{ task.min_unres_pdb }}</div>
+			</li>		
+			
+	{% endif %}
+        {% if task.type == "md" %}
+		        <li class="list-group-item task-item">
+		            <div class="col-xs-10"> starting </div>
+		 	    <div class="col-xs-10">{{ task.md_start}}</div>
+			</li>		
+			
+		        <li class="list-group-item task-item">
+		            <div class="col-xs-10"> input pdb </div>
+		 	    <div class="col-xs-10">{{ task.myfile1 }}</div>
+			</li>		
+		        <li class="list-group-item task-item">
+		            <div class="col-xs-10"> seed </div>
+		 	    <div class="col-xs-10">{{ task.md_seed}}</div>
+			</li>		
+		        <li class="list-group-item task-item">
+		            <div class="col-xs-10"> pdbref </div>
+		 	    <div class="col-xs-10">{{ task.md_pdbref}}</div>
+			</li>		
+		        <li class="list-group-item task-item">
+		            <div class="col-xs-10"> respa </div>
+		 	    <div class="col-xs-10">{{ task.md_respa}}</div>
+			</li>		
+		        <li class="list-group-item task-item">
+		            <div class="col-xs-10"> temperature </div>
+		 	    <div class="col-xs-10">{{ task.md_temp}}</div>
+			</li>		
+		        <li class="list-group-item task-item">
+		            <div class="col-xs-10"> nstep </div>
+		 	    <div class="col-xs-10">{{ task.md_nstep}}</div>
+			</li>		
+		        <li class="list-group-item task-item">
+		            <div class="col-xs-10"> ntwe </div>
+		 	    <div class="col-xs-10">{{ task.md_ntwe}}</div>
+			</li>		
+		        <li class="list-group-item task-item">
+		            <div class="col-xs-10"> ntwx </div>
+		 	    <div class="col-xs-10">{{ task.md_ntwx}}</div>
+			</li>		
+		        <li class="list-group-item task-item">
+		            <div class="col-xs-10"> dt </div>
+		 	    <div class="col-xs-10">{{ task.md_dt}}</div>
+			</li>		
+		        <li class="list-group-item task-item">
+		            <div class="col-xs-10"> thermostat </div>
+		 	    <div class="col-xs-10">{{ task.md_lang}}</div>
+			</li>		
+			
+			{% if task.md_lang == "berendsen" %}
+			
+		        <li class="list-group-item task-item">
+		            <div class="col-xs-10"> tau </div>
+		 	    <div class="col-xs-10">{{ task.md_tau}}</div>
+			</li>		
+			
+			{% else %}
+			
+		        <li class="list-group-item task-item">
+		            <div class="col-xs-10"> scal_fric </div>
+		 	    <div class="col-xs-10">{{ task.md_scal_fric}}</div>
+			</li>	
+			
+			{% endif %}
+				
+		        <li class="list-group-item task-item">
+		            <div class="col-xs-10"> mdpdb </div>
+		 	    <div class="col-xs-10">{{ task.md_mdpdb}}</div>
+			</li>		
+        {% endif %}
+
+        {% if task.type == "remd" %}
+
+		        <li class="list-group-item task-item">
+		            <div class="col-xs-10"> nrep </div>
+		 	    <div class="col-xs-10">{{ task.remd_nrep}}</div>
+			</li>		
+		        <li class="list-group-item task-item">
+		            <div class="col-xs-10"> starting </div>
+		 	    <div class="col-xs-10">{{ task.md_start}}</div>
+			</li>		
+			
+		        <li class="list-group-item task-item">
+		            <div class="col-xs-10"> input pdb </div>
+		 	    <div class="col-xs-10">{{ task.myfile1 }}</div>
+			</li>		
+		        <li class="list-group-item task-item">
+		            <div class="col-xs-10"> seed </div>
+		 	    <div class="col-xs-10">{{ task.md_seed}}</div>
+			</li>		
+		        <li class="list-group-item task-item">
+		            <div class="col-xs-10"> pdbref </div>
+		 	    <div class="col-xs-10">{{ task.md_pdbref}}</div>
+			</li>		
+		        <li class="list-group-item task-item">
+		            <div class="col-xs-10"> respa </div>
+		 	    <div class="col-xs-10">{{ task.md_respa}}</div>
+			</li>		
+		        <li class="list-group-item task-item">
+		            <div class="col-xs-10"> nstep </div>
+		 	    <div class="col-xs-10">{{ task.md_nstep}}</div>
+			</li>		
+		        <li class="list-group-item task-item">
+		            <div class="col-xs-10"> ntwe </div>
+		 	    <div class="col-xs-10">{{ task.md_ntwe}}</div>
+			</li>		
+		        <li class="list-group-item task-item">
+		            <div class="col-xs-10"> nstex </div>
+		 	    <div class="col-xs-10">{{ task.remd_nstex}}</div>
+			</li>		
+		        <li class="list-group-item task-item">
+		            <div class="col-xs-10"> ntwx </div>
+		 	    <div class="col-xs-10">{{ task.md_ntwx}}</div>
+			</li>					
+		        <li class="list-group-item task-item">
+		            <div class="col-xs-10"> dt </div>
+		 	    <div class="col-xs-10">{{ task.md_dt}}</div>
+			</li>		
+		        <li class="list-group-item task-item">
+		            <div class="col-xs-10"> thermostat </div>
+		 	    <div class="col-xs-10">{{ task.md_lang}}</div>
+			</li>		
+			
+			{% if task.md_lang == "berendsen" %}
+			
+		        <li class="list-group-item task-item">
+		            <div class="col-xs-10"> tau </div>
+		 	    <div class="col-xs-10">{{ task.md_tau}}</div>
+			</li>		
+			
+			{% else %}
+			
+		        <li class="list-group-item task-item">
+		            <div class="col-xs-10"> scal_fric </div>
+		 	    <div class="col-xs-10">{{ task.md_scal_fric}}</div>
+			</li>	
+			
+			{% endif %}
+				
+		        <li class="list-group-item task-item">
+		            <div class="col-xs-10"> temperatures </div>
+		 	    <div class="col-xs-10">{{ task.remd_multi_t}}</div>
+			</li>		
+		        <li class="list-group-item task-item">
+		            <div class="col-xs-10"> multiplex </div>
+		 	    <div class="col-xs-10">{{ task.remd_multi_m}}</div>
+			</li>		
+		        <li class="list-group-item task-item">
+		            <div class="col-xs-10"> temperature for clustering</div>
+		 	    <div class="col-xs-10">{{ task.remd_cluter_temp}}</div>
+			</li>		
+
+
+        {% endif %}
+
+		        <li class="list-group-item task-item">
+		            <div class="col-xs-10"> Box X Y Z</div>
+		 	    <div class="col-xs-3">{{ task.boxx}}</div>
+		 	    <div class="col-xs-3">{{ task.boxy}}</div>		 	    
+		 	    <div class="col-xs-3">{{ task.boxz}}</div>		 	    
+			</li>		
+
+
+	<p>
+	<h3> Results </h3>
+		        <li class="list-group-item task-item">
+		            <div class="col-xs-10"> Directory </div>
+		 	    <div class="col-xs-10">
+		 	    <a href="/myfiles/list/{{task.jobdirname}}/">
+		 	    {{ task.jobdirname }}
+		 	    </a>
+		 	    </div>
+			</li>		
+
+
+	{% if task.done %}
+			
+			{% if task.type == "min" %}
+			
+		        <li class="list-group-item task-item">
+		            <div class="col-xs-10"> Etot </div>
+		 	    <div class="col-xs-10">{{ task.etot }}</div>
+			</li>		
+			
+			<li class="list-group-item task-item">
+			  <div class="col-xs-10"> UNRES model </div>
+			  <div class="col-xs-10"> 
+			  <a
+			   href="/myfiles/download-file/{{task.jobdirname}}/unres.pse">
+			  <img 
+			  src="/myfiles/download-file/{{task.jobdirname}}/unres.png"
+			  width="500"></a> </div>
+			</li>
+
+
+			<li class="list-group-item task-item">
+			  <div class="col-xs-10"> Structure overlap </div>
+			  <div class="col-xs-10"> <img 
+			  src="/myfiles/download-file/{{task.jobdirname}}/unres_overlap.png"
+			  width="500"> </div>
+			</li>
+
+
+                        {% endif %}
+
+		        <li class="list-group-item task-item">
+		            <div class="col-xs-10"> Results </div>
+		 	    <div class="col-xs-10">{{ task.results_text|linebreaks }}</div>
+			</li>		
+			
+			{% if task.type == "md" %}
+
+			<li class="list-group-item task-item">
+			  <div class="col-xs-10"> Temperature histogram </div>
+			  <div class="col-xs-10"> <img 
+			  src="/myfiles/download-file/{{task.jobdirname}}/temp_hist.png"
+			  width="500"> </div>
+			</li>
+
+			<li class="list-group-item task-item">
+			  <div class="col-xs-10"> Potential energy </div>
+			  <div class="col-xs-10"> <img 
+			  src="/myfiles/download-file/{{task.jobdirname}}/md_ene.png"
+			  width="500"> </div>
+			</li>
+
+			    <li class="list-group-item task-item">
+			    <div class="col-xs-10"> Movie </div>
+			    <div class="col-xs-10"> 
+
+                            <video width="500" height="400" preload controls>
+                            <source
+                            src="/myfiles/download-file/{{task.jobdirname}}/md.ogv"
+                            type="video/ogg; codecs=theora"> </source>
+                            </video>
+			  
+			    </div>
+			    </li>
+			    
+			<li class="list-group-item task-item">
+			  <div class="col-xs-10"> Radius of gyration based
+			  on C<sup>α</sup> coordinates </div>
+			  <div class="col-xs-10"> <img 
+			  src="/myfiles/download-file/{{task.jobdirname}}/md_gyr.png"
+			  width="500"> </div>
+			</li>
+			    
+
+		
+			   {% if task.md_pdbref %}
+			<li class="list-group-item task-item">
+			  <div class="col-xs-10"> RMSD </div>
+			  <div class="col-xs-10"> <img 
+			  src="/myfiles/download-file/{{task.jobdirname}}/md_rms.png"
+			  width="500"> </div>
+			</li>
+
+			<li class="list-group-item task-item">
+			  <div class="col-xs-10"> fraction of native
+			  side-chain concacts </div>
+			  <div class="col-xs-10"> <img 
+			  src="/myfiles/download-file/{{task.jobdirname}}/md_fracn.png"
+			  width="500"> </div>
+			</li>
+			
+			   {% endif %}
+
+			   {% if task.md_start == "pdbstart" %}
+			<li class="list-group-item task-item">
+			  <div class="col-xs-10"> fluctuations </div>
+			  <div class="col-xs-10"> <img 
+			  src="/myfiles/download-file/{{task.jobdirname}}/fluct_plot.png"
+			  width="500"> </div>
+			</li>
+
+			<li class="list-group-item task-item">
+			  <div class="col-xs-10"> fluctuations putty on
+			  starting structure</div>
+			  <div class="col-xs-10"> 
+			  <a
+			  href="/myfiles/download-file/{{task.jobdirname}}/fluct.pse">
+			  <img 
+			  src="/myfiles/download-file/{{task.jobdirname}}/fluct.png"
+			  width="500"></a> </div>
+			</li>
+			
+			   {% endif %}
+
+
+
+			{% endif %}
+			
+			{% if task.type == "remd" %}
+			
+			<li class="list-group-item task-item">
+			  <div class="col-xs-10"> Energy histogram </div>
+			  <div class="col-xs-10"> <img 
+			  src="/myfiles/download-file/{{task.jobdirname}}/remd_ene_hist.png"
+			  width="500"> </div>
+			</li>
+
+			<li class="list-group-item task-item">
+			  <div class="col-xs-10"> Energy vs. temperature </div>
+			  <div class="col-xs-10"> <img 
+			  src="/myfiles/download-file/{{task.jobdirname}}/remd_Tene.png"
+			  width="500"> </div>
+			</li>
+			
+			<li class="list-group-item task-item">
+			  <div class="col-xs-10"> Cv vs. temperature </div>
+			  <div class="col-xs-10"> <img 
+			  src="/myfiles/download-file/{{task.jobdirname}}/remd_cv.png"
+			  width="500"> </div>
+			</li>
+			
+			   {% if task.md_pdbref %}
+
+			<li class="list-group-item task-item">
+			  <div class="col-xs-10"> Average RMSD vs. temperature </div>
+			  <div class="col-xs-10"> <img 
+			  src="/myfiles/download-file/{{task.jobdirname}}/remd_rmsd.png"
+			  width="500"> </div>
+			</li>
+
+			<li class="list-group-item task-item">
+			  <div class="col-xs-10"> potential energy vs. RMSD</div>
+			  <div class="col-xs-10"> <img 
+			  src="/myfiles/download-file/{{task.jobdirname}}/remd_ene_rms.png"
+			  width="500"> </div>
+			</li>
+
+                        <li class="list-group-item task-item">
+			  <div class="col-xs-10"> RMSD vs. step*replica
+			  colored by bath temperature</div>
+			  <div class="col-xs-10"> <img 
+			  src="/myfiles/download-file/{{task.jobdirname}}/remd_step_rms.png"
+			  width="500"> </div>
+			</li>
+
+			
+			   {% endif %} 
+                          
+			<li class="list-group-item task-item">
+			  <div class="col-xs-10"> exchanges (walk in T) </div>
+			  <div class="col-xs-10"> <img 
+			  src="/myfiles/download-file/{{task.jobdirname}}/remd_ex.png"
+			  width="500"> </div>
+			</li>
+
+			<li class="list-group-item task-item">
+			  <div class="col-xs-10"> model1 after conversion
+			  to allatom 
+			  {{ task.remd_model1|linebreaks }}
+			  </div>
+			  <div class="col-xs-10"> 
+			  <a
+			  href="/myfiles/download-file/{{task.jobdirname}}/MODEL1.pdb">
+			  <img
+			  src="/myfiles/download-file/{{task.jobdirname}}/model1.png" width="500">
+			  </a></div>
+			</li>
+			<li class="list-group-item task-item">
+			  <div class="col-xs-10"> model2 after conversion
+			  to allatom 
+			  {{ task.remd_model2|linebreaks }}
+			  </div>
+			  <div class="col-xs-10"> 
+			  <a
+			  href="/myfiles/download-file/{{task.jobdirname}}/MODEL2.pdb">
+			  <img
+			  src="/myfiles/download-file/{{task.jobdirname}}/model2.png" width="500">
+			  </a></div>
+			</li>
+			<li class="list-group-item task-item">
+			  <div class="col-xs-10"> model3 after conversion
+			  to allatom 
+			  {{ task.remd_model3|linebreaks }}
+			  </div>
+			  <div class="col-xs-10"> 
+			  <a
+			  href="/myfiles/download-file/{{task.jobdirname}}/MODEL3.pdb">
+			  <img
+			  src="/myfiles/download-file/{{task.jobdirname}}/model3.png" width="500">
+			  </a></div>
+			</li>
+			<li class="list-group-item task-item">
+			  <div class="col-xs-10"> model4 after conversion
+			  to allatom 
+			  {{ task.remd_model4|linebreaks }}
+			  </div>
+			  <div class="col-xs-10"> 
+			  <a
+			  href="/myfiles/download-file/{{task.jobdirname}}/MODEL4.pdb">
+			  <img
+			  src="/myfiles/download-file/{{task.jobdirname}}/model4.png" width="500">
+			  </a></div>
+			</li>
+			<li class="list-group-item task-item">
+			  <div class="col-xs-10"> model5 after conversion
+			  to allatom 
+			  {{ task.remd_model5|linebreaks }}
+			  </div>
+			  <div class="col-xs-10"> 
+			  <a
+			  href="/myfiles/download-file/{{task.jobdirname}}/MODEL5.pdb">
+			  <img
+			  src="/myfiles/download-file/{{task.jobdirname}}/model5.png" width="500">
+			  </a></div>
+			</li>
+
+			
+			{% endif %}
+
+	{% endif %}		
+
+	</ul>
+{% endblock %}
diff --git a/django_simple/todo/urls.py b/django_simple/todo/urls.py
index 6918f4b..fa25f34 100644
--- a/django_simple/todo/urls.py
+++ b/django_simple/todo/urls.py
@@ -8,6 +8,7 @@ urlpatterns = [
 	url(r'^$', views.index),
 	url(r'^add/$', views.add),
 	url(r'^refresh_done/$', views.refresh_done),
+	url(r'^refresh_done1/(?P<task_id>\d+)/$', views.refresh_done1),	
 	url(r'^add_min/(?P<task_id>\d+)/$', views.add_min,name='add_min'),	
 	url(r'^add_min/(?P<task_id>\d+)/adv/$', views.add_min_a,name='add_min_a'),		
 	url(r'^add_md/(?P<task_id>\d+)/$', views.add_md,name='add_md'),	
@@ -16,5 +17,6 @@ urlpatterns = [
 	url(r'^add_remd/(?P<task_id>\d+)/adv/$', views.add_remd_a,name='add_remd_a'),		
 	url(r'^add_mlist/(?P<task_id>\d+)/$', views.addmlist,name='addmlist'),		
         url(r'^details/(?P<task_id>\d+)/$', views.details,name='details'),
+        url(r'^details1/(?P<user_id>\w+)/(?P<task_id>\d+)/$', views.details1,name='details1'),        
 	url(r'^delete/(?P<task_id>\d+)/$', views.delete),
 ]
diff --git a/django_simple/todo/views.py b/django_simple/todo/views.py
index 941d637..521a300 100644
--- a/django_simple/todo/views.py
+++ b/django_simple/todo/views.py
@@ -142,7 +142,7 @@ def add_min(request,task_id):
              
              task.save()
              if is_lazy_user(request.user):
-              return render(request, "details.html",{'task':task})
+              return redirect('/details1/'+str(task.owner)+'/'+str(task.id)+'/')              
              else:
               return redirect('/')
     else:
@@ -186,7 +186,7 @@ def add_min_a(request,task_id):
              
              task.save()
              if is_lazy_user(request.user):
-              return render(request, "details.html",{'task':task})
+              return redirect('/details1/'+str(task.owner)+'/'+str(task.id)+'/')             
              else:
               return redirect('/')
     else:
@@ -231,7 +231,7 @@ def add_md(request,task_id):
              
              task.save()
              if is_lazy_user(request.user):
-              return render(request, "details.html",{'task':task})
+              return redirect('/details1/'+str(task.owner)+'/'+str(task.id)+'/')
              else:
               return redirect('/')
     else:
@@ -289,7 +289,7 @@ def add_md_a(request,task_id):
              
              task.save()
              if is_lazy_user(request.user):
-              return render(request, "details.html",{'task':task})
+              return redirect('/details1/'+str(task.owner)+'/'+str(task.id)+'/')             
              else:
               return redirect('/')
     else:
@@ -336,7 +336,7 @@ def add_remd(request,task_id):
              
              task.save()
              if is_lazy_user(request.user):
-              return render(request, "details.html",{'task':task})
+              return redirect('/details1/'+str(task.owner)+'/'+str(task.id)+'/')             
              else:
               return redirect('/')
     else:
@@ -416,7 +416,7 @@ def addmlist(request,task_id):
              
              task.save()
              if is_lazy_user(request.user):
-              return render(request, "details.html",{'task':task})
+              return redirect('/details1/'+str(task.owner)+'/'+str(task.id)+'/')              
              else:
               return redirect('/')
     else:
@@ -437,20 +437,69 @@ def addmlist(request,task_id):
     p_type='replica exchange molecular dynamics - advanced options'
     return render(request, 'edit_lista.html', {'form': form, 'task':task, 'p_type':p_type})
 
+@login_required
 def details(request,task_id):
     task = get_object_or_404(Task, id=task_id)
     return render(request, "details.html",{'task':task})
 
+
+def details1(request,user_id,task_id):
+    task = get_object_or_404(Task, id=task_id)
+    return render(request, "details1.html",{'task':task})
+
+
 @login_required
 def delete(request, task_id):
     Task.objects.get(id=task_id).delete()
     return redirect('/')
 
+def refresh_done1(request, task_id):
+    task = get_object_or_404(Task, id=task_id)
+    user = task.owner
+    refresh_done0(task)
+
+    proc = subprocess.Popen('/opt/torque/bin/qstat', stdout=subprocess.PIPE)
+    njob=0
+    nq=0
+    for line in proc.stdout:
+      if 'piasek4' in line:
+        if line.split()[1]=='test_server':
+          njob+=1
+          if line.split()[-2]=='Q':
+            nq+=1
+    variable='Idle jobs='+str(nq)+' Total jobs='+str(njob)
+
+    return redirect('/details1/'+str(user)+'/'+str(task.id)+'/')
+
+
 @login_required
 def refresh_done(request):
     user = request.user
     tasks = Task.objects.filter(owner=user).order_by('-created_date')
     for task in tasks:
+      refresh_done0(task)
+
+    proc = subprocess.Popen('/opt/torque/bin/qstat', stdout=subprocess.PIPE)
+    njob=0
+    nq=0
+    for line in proc.stdout:
+      if 'piasek4' in line:
+        if line.split()[1]=='test_server':
+          njob+=1
+          if line.split()[-2]=='Q':
+            nq+=1
+    variable='Idle jobs='+str(nq)+' Total jobs='+str(njob)
+
+    if is_lazy_user(request.user):
+     return redirect('/details1/'+str(user)+'/'+str(task.id)+'/')
+    else:
+     return render(request, "index.html", {
+                'tasks': tasks ,
+                'variable' : variable
+                        })
+
+      
+def refresh_done0(task):
       if os.path.isfile(task.jobdirname+'/finished') and not task.done:
          task.done=True
 
@@ -574,23 +623,5 @@ def refresh_done(request):
              task.running=100
          task.save()
 
-    proc = subprocess.Popen('/opt/torque/bin/qstat', stdout=subprocess.PIPE)
-    njob=0
-    nq=0
-    for line in proc.stdout:
-      if 'piasek4' in line:
-        if line.split()[1]=='test_server':
-          njob+=1
-          if line.split()[-2]=='Q':
-            nq+=1
-    variable='Idle jobs='+str(nq)+' Total jobs='+str(njob)
-
-    if is_lazy_user(request.user):
-     return redirect('/details/'+str(task.id)+'/')
-    else:
-     return render(request, "index.html", {
-                'tasks': tasks ,
-                'variable' : variable
-                        })
     
-#   return redirect('/')        
+      return  
-- 
1.7.9.5