X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;f=django_simple%2Ftodo%2Fviews.py;h=ce66ef0f2be525415d2e7959998ac30448ffeea4;hb=760a966a11c87208df1c14edd4a9ae3f0b612bc5;hp=de8d085a8a90e3c2eec7d04c4b9b34ac03b9502e;hpb=8421252fcfe79dc7771823b337d7a38903af54a6;p=django_unres.git diff --git a/django_simple/todo/views.py b/django_simple/todo/views.py index de8d085..ce66ef0 100644 --- a/django_simple/todo/views.py +++ b/django_simple/todo/views.py @@ -108,7 +108,7 @@ def index(request): 'tasks': tasks }) -@allow_lazy_user +@login_required def add(request): if request.method == 'POST': form = TaskForm(request.POST) @@ -124,11 +124,27 @@ def add(request): def add_min(request,task_id): task = get_object_or_404(Task, id=task_id) if request.method == 'POST': + if '_example' in request.POST: + data= {'name':task.name,'pdbid':'1BDD'} + form = TaskForm_min(initial=data) + else: form = TaskForm_min(request.POST,request.FILES) if form.is_valid(): task.name=form.cleaned_data["name"] task.type="min" - task.myfile1=form.cleaned_data["file1"] + pdbid=form.cleaned_data["pdbid"] + + basename = str(task.owner) + suffix = datetime.datetime.now().strftime("%y%m%d_%H%M%S") + task.jobdirname = "_".join([basename, suffix]) + + if pdbid: + os.mkdir(task.jobdirname) + task.myfile1,header=urllib.urlretrieve('http://files.rcsb.org/download/'+pdbid+'.pdb', + task.jobdirname+'/plik.pdb') + task.pdbcode=pdbid + else: + task.myfile1=form.cleaned_data["file1"] seq,task.ssbond=from_pdb(task.myfile1) task.md_seq="" @@ -136,12 +152,12 @@ def add_min(request,task_id): task.md_seq=task.md_seq+seq[i:i+40]+" " task.ready=True - basename = str(task.owner) - suffix = datetime.datetime.now().strftime("%y%m%d_%H%M%S") - task.jobdirname = "_".join([basename, suffix]) task.save() - return redirect('/') + if is_lazy_user(request.user): + return redirect('/details1/'+str(task.owner)+'/'+str(task.id)+'/') + else: + return redirect('/') else: data= {'name':task.name} form = TaskForm_min(initial=data) @@ -153,6 +169,10 @@ def add_min(request,task_id): def add_min_a(request,task_id): task = get_object_or_404(Task, id=task_id) if request.method == 'POST': + if '_example' in request.POST: + data= {'name':task.name,'pdbid':'1EI0','unres_ff':'opt-wtfsa-2'} + form = TaskForm_min_a(initial=data) + else: form = TaskForm_min_a(request.POST,request.FILES) if form.is_valid(): task.name=form.cleaned_data["name"] @@ -163,7 +183,20 @@ def add_min_a(request,task_id): task.min_maxmin=form.cleaned_data["min_maxmin"] task.min_maxfun=form.cleaned_data["min_maxfun"] task.min_pdbout=form.cleaned_data["min_pdbout"] - task.myfile1=form.cleaned_data["file1"] + + basename = str(task.owner) + suffix = datetime.datetime.now().strftime("%y%m%d_%H%M%S") + task.jobdirname = "_".join([basename, suffix]) + + pdbid=form.cleaned_data["pdbid"] + if pdbid: + os.mkdir(task.jobdirname) + task.myfile1,header=urllib.urlretrieve('http://files.rcsb.org/download/'+pdbid+'.pdb', + task.jobdirname+'/plik.pdb') + task.pdbcode=pdbid + else: + task.myfile1=form.cleaned_data["file1"] + task.min_unres_pdb=form.cleaned_data["min_unres_pdb"] task.unres_ff=form.cleaned_data["unres_ff"] task.boxx=form.cleaned_data["boxx"] @@ -175,14 +208,13 @@ def add_min_a(request,task_id): for i in range(0,len(seq),40): task.md_seq=task.md_seq+seq[i:i+40]+" " - task.ready=True - basename = str(task.owner) - suffix = datetime.datetime.now().strftime("%y%m%d_%H%M%S") - task.jobdirname = "_".join([basename, suffix]) task.save() - return redirect('/') + if is_lazy_user(request.user): + return redirect('/details1/'+str(task.owner)+'/'+str(task.id)+'/') + else: + return redirect('/') else: data= {'name':task.name} form = TaskForm_min_a(initial=data) @@ -194,6 +226,11 @@ def add_min_a(request,task_id): def add_md(request,task_id): task = get_object_or_404(Task, id=task_id) if request.method == 'POST': + if '_example' in request.POST: + data= {'name':task.name,'pdbid':'1IGD','md_start':'pdbstart', + 'md_pdbref':True,'md_temp':200} + form = TaskForm_md(initial=data) + else: form = TaskForm_md(request.POST,request.FILES) if form.is_valid(): task.name=form.cleaned_data["name"] @@ -202,8 +239,19 @@ def add_md(request,task_id): task.md_start=form.cleaned_data["md_start"] task.md_temp=form.cleaned_data["md_temp"] task.md_nstep=form.cleaned_data["md_nstep"] - - task.myfile1=form.cleaned_data["file1"] + + basename = str(task.owner) + suffix = datetime.datetime.now().strftime("%y%m%d_%H%M%S") + task.jobdirname = "_".join([basename, suffix]) + + pdbid=form.cleaned_data["pdbid"] + if pdbid: + os.mkdir(task.jobdirname) + task.myfile1,header=urllib.urlretrieve('http://files.rcsb.org/download/'+pdbid+'.pdb', + task.jobdirname+'/plik.pdb') + task.pdbcode=pdbid + else: + task.myfile1=form.cleaned_data["file1"] task.md_pdbref=form.cleaned_data["md_pdbref"] task.md_seq="" @@ -219,13 +267,10 @@ def add_md(request,task_id): task.ssbond='' task.ready=True - basename = str(task.owner) - suffix = datetime.datetime.now().strftime("%y%m%d_%H%M%S") - task.jobdirname = "_".join([basename, suffix]) 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: @@ -239,12 +284,28 @@ def add_md(request,task_id): def add_md_a(request,task_id): task = get_object_or_404(Task, id=task_id) if request.method == 'POST': + if '_example' in request.POST: + data= {'name':task.name,'pdbid':'1L2Y','md_start':'extconf', + 'md_pdbref':True,'md_mdpdb':True} + form = TaskForm_md_a(initial=data) + else: form = TaskForm_md_a(request.POST,request.FILES) if form.is_valid(): task.name=form.cleaned_data["name"] task.type="md" - task.myfile1=form.cleaned_data["file1"] + basename = str(task.owner) + suffix = datetime.datetime.now().strftime("%y%m%d_%H%M%S") + task.jobdirname = "_".join([basename, suffix]) + + pdbid=form.cleaned_data["pdbid"] + if pdbid: + os.mkdir(task.jobdirname) + task.myfile1,header=urllib.urlretrieve('http://files.rcsb.org/download/'+pdbid+'.pdb', + task.jobdirname+'/plik.pdb') + task.pdbcode=pdbid + else: + task.myfile1=form.cleaned_data["file1"] task.md_start=form.cleaned_data["md_start"] task.md_pdbref=form.cleaned_data["md_pdbref"] @@ -277,12 +338,12 @@ def add_md_a(request,task_id): task.ready=True - basename = str(task.owner) - suffix = datetime.datetime.now().strftime("%y%m%d_%H%M%S") - task.jobdirname = "_".join([basename, suffix]) task.save() - return redirect('/') + if is_lazy_user(request.user): + return redirect('/details1/'+str(task.owner)+'/'+str(task.id)+'/') + else: + return redirect('/') else: data= {'name':task.name} form = TaskForm_md_a(initial=data) @@ -294,12 +355,28 @@ def add_md_a(request,task_id): def add_remd(request,task_id): task = get_object_or_404(Task, id=task_id) if request.method == 'POST': + if '_example' in request.POST: + data= {'name':task.name,'pdbid':'1L2Y','md_pdbref':True} + form = TaskForm_remd(initial=data) + else: form = TaskForm_remd(request.POST,request.FILES) if form.is_valid(): task.name=form.cleaned_data["name"] task.type="remd" task.md_start=form.cleaned_data["md_start"] - task.myfile1=form.cleaned_data["file1"] + + basename = str(task.owner) + suffix = datetime.datetime.now().strftime("%y%m%d_%H%M%S") + task.jobdirname = "_".join([basename, suffix]) + + pdbid=form.cleaned_data["pdbid"] + if pdbid: + os.mkdir(task.jobdirname) + task.myfile1,header=urllib.urlretrieve('http://files.rcsb.org/download/'+pdbid+'.pdb', + task.jobdirname+'/plik.pdb') + task.pdbcode=pdbid + else: + task.myfile1=form.cleaned_data["file1"] task.md_pdbref=form.cleaned_data["md_pdbref"] task.md_ntwx=task.remd_nstex @@ -321,12 +398,12 @@ def add_remd(request,task_id): task.ready=True - basename = str(task.owner) - suffix = datetime.datetime.now().strftime("%y%m%d_%H%M%S") - task.jobdirname = "_".join([basename, suffix]) task.save() - return redirect('/') + if is_lazy_user(request.user): + return redirect('/details1/'+str(task.owner)+'/'+str(task.id)+'/') + else: + return redirect('/') else: data= {'name':task.name} form = TaskForm_remd(initial=data) @@ -338,12 +415,29 @@ def add_remd(request,task_id): def add_remd_a(request,task_id): task = get_object_or_404(Task, id=task_id) if request.method == 'POST': + if '_example' in request.POST: + data= {'name':task.name,'pdbid':'1E0G','md_pdbref':True, + 'md_nstep':500000,'md_lang':'berendsen','unres_ff':'opt-wtfsa-2', + 'remd_cluter_temp':280} + form = TaskForm_remd_a(initial=data) + else: form = TaskForm_remd_a(request.POST,request.FILES) if form.is_valid(): task.name=form.cleaned_data["name"] task.type="remd" - task.myfile1=form.cleaned_data["file1"] + basename = str(task.owner) + suffix = datetime.datetime.now().strftime("%y%m%d_%H%M%S") + task.jobdirname = "_".join([basename, suffix]) + + pdbid=form.cleaned_data["pdbid"] + if pdbid: + os.mkdir(task.jobdirname) + task.myfile1,header=urllib.urlretrieve('http://files.rcsb.org/download/'+pdbid+'.pdb', + task.jobdirname+'/plik.pdb') + task.pdbcode=pdbid + else: + task.myfile1=form.cleaned_data["file1"] task.md_start=form.cleaned_data["md_start"] task.md_pdbref=form.cleaned_data["md_pdbref"] @@ -375,14 +469,9 @@ def add_remd_a(request,task_id): task.boxy=form.cleaned_data["boxy"] task.boxz=form.cleaned_data["boxz"] - task.remd_cluter_temp=form.cleaned_data["remd_cluter_temp"] task.unres_ff=form.cleaned_data["unres_ff"] - basename = str(task.owner) - suffix = datetime.datetime.now().strftime("%y%m%d_%H%M%S") - task.jobdirname = "_".join([basename, suffix]) - task.save() return redirect('addmlist',task_id=task.id) else: @@ -403,7 +492,10 @@ def addmlist(request,task_id): task.ready=True task.save() - return redirect('/') + if is_lazy_user(request.user): + return redirect('/details1/'+str(task.owner)+'/'+str(task.id)+'/') + else: + return redirect('/') else: if task.unres_ff == 'E0LL2Y': data= {'name':task.name,'nrep':task.remd_nrep,'multiplexing': @@ -422,20 +514,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 @@ -559,23 +700,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