alcatel/document/views.py
changeset 42 de4e97ded3c6
parent 37 3848e1813a30
--- a/alcatel/document/views.py	Wed Sep 04 10:03:16 2013 +0200
+++ b/alcatel/document/views.py	Tue Sep 10 13:25:16 2013 +0200
@@ -22,16 +22,19 @@
 from document.models import Documentaryfile
 from django.core.urlresolvers import reverse
 from mediapartdb.MediapartReader import MediapartReader
+from dataparser.ClientDocumentaryFileAttributes import ClientDocumentaryFileAttributes
 
 logger = logging.getLogger('document')
 
-def article(request,cluster_title, id_article):
+def article(request,id_article):
 	logger.info('article called'+str(request))
 	logger.info('article called'+str(id_article))
 	reader = MediapartReader()
 	url = reader.get_url(str(id_article))
 	logger.info('url'+str(url))
-	my_data_dictionary = {'url_article': url, 'cluster_title': cluster_title}
+	cluster_title = request.POST['clustertitle']
+	url_cluster = request.POST['urlCluster']
+	my_data_dictionary = {'url_article': url, 'cluster_title': cluster_title, 'url_cluster': url_cluster}
 	
 	my_data_dictionary['dossierDocs'] = []
 
@@ -257,6 +260,8 @@
 					request.session['query_id_streamgraph'] = ''
 					request.session['query_id'] = ''
 					request.session['key1'] = ''
+					request.session['user'] = ''
+					request.session['docId'] = 0
 					request.session['from_date'] = ''
 					request.session['to_date'] = ''
 					request.session['category'] = []
@@ -423,8 +428,11 @@
 
 	my_data_dictionary = {'user': request.user}
 	my_data_dictionary['dossierDocs'] = []
-
-	
+	logger.info('get_documentary_file user ********** ='+str(request.session['user']))
+	logger.info('get_documentary_file docId ********** ='+str(request.session['docId']))
+	'''request.session['user'] = request.user'''
+	request.session['docId'] = docId
+	logger.info('get_documentary_file docId ********** ='+str(request.session['docId']))
 	dossierDoc = []
 	if request.user.is_authenticated():
 		logger.info('user')
@@ -446,10 +454,12 @@
 		documents = Documents(request)
 		jsondocuments = documents.get_documents(0,cluster,offset,count,docId)
 		request.session['jsondocuments'] = jsondocuments
+		logger.info('redirect clusterDoc.html')
 		return render_to_response('clusterDoc.html',my_data_dictionary, context_instance=RequestContext(request))
 	else:		
 		logger.info('my_data_dictionary = '+str(request.session['jsontreemapdossierdoc']))
 		logger.info('my_data_dictionary = '+str(request.session['jsonstreamgraphdossierdoc']))
+		logger.info('redirect index-dossier.html')
 		return render_to_response('index-dossier.html',my_data_dictionary, context_instance=RequestContext(request))
 		
 		
@@ -498,6 +508,19 @@
 		raise Http404
 	return HttpResponse("OK")
 
+def documentary_file_modify(request):
+	if request.method == 'POST':
+		logger.info('documentary_file_modify = '+str(request))
+		attr = ClientDocumentaryFileAttributes(request)
+		documentary_file = DocumentaryFile(request);
+		json = documentary_file.modify(attr)
+		url_redirect = request.GET.get('next', '/')+attr.get_user()
+		logger.info('url_redirect = '+str(url_redirect))
+		return HttpResponseRedirect(url_redirect) 				
+	else:
+		raise Http404
+	return HttpResponse("OK")
+
 def documentary_file_delete(request,docId=0):
 	logger.info('isajax ???'+str(request.is_ajax()))	
 	if request.method == 'POST':