Changeset 1465 for trunk/gestorpsi

Timestamp:

15/12/2009 11:43:07 (2 years ago)

Author:

sergio

Message:

fixed client list in service sidebar

Location:

trunk/gestorpsi

Files:

• media/js/gestorpsi.json.js (modified) (2 diffs)
• service/views.py (modified) (4 diffs)

trunk/gestorpsi/media/js/gestorpsi.json.js

@@ -22 +22 @@
     $.getJSON(url, function(json) {
         var tableTR = '';
-
-        /**
-        * build html
-        */
-
         tableTR = '';
 
-        jQuery.each(json,  function(){
-              jQuery.each(this.client,  function(){
-                        str_client = this.name;
-                        str_client_id = this.id;
-                    });
-
-              str_professional = '';
-              str_professional_id = '';
-              str_occurence = '';
-
-              if (this.professional){
-               jQuery.each(this.professional,  function(){
-                        str_professional += ' ('+ this.name + ')';
-                        str_professional_id = this.id;
-                    });
-                }
-
-              if (this.occurence){
-               jQuery.each(this.occurence,  function(){
-                        str_occurence += ' ('+ this.p + ')';
-                    });
-                }
+        /**
+        * build html
+        */
+
+        jQuery.each(json,  function(){
+            jQuery.each(this.client,  function(){
+                str_client = this.name;
+                str_client_id = this.id;
+            });
+
+            str_professional = '';
+            str_professional_id = '';
+            //str_occurence = '';
+
+            if (this.professional){
+                jQuery.each(this.professional,  function(){
+                    str_professional += ' '+ this.name + '';
+                    str_professional_id = this.id;
+                });
+            }
+
+            //if (this.occurence){
+            //    jQuery.each(this.occurence,  function(){
+            //        str_occurence += ' ('+ this.p + ')';
+            //    });
+            //}
  
-                tableTR += '<tr>';
-                tableTR += '<td class="title">'+ str_client +' '+ str_professional +'<br /> Date ' + this.dt + '<br />Occurences: '+ str_occurence;
-                tableTR += '</td>';
-                tableTR += '<td>';
-                tableTR += '</td>';
-                tableTR += '</tr>';
-        });
-
+            tableTR += '<tr>';
+            tableTR += '<td class="title">'+ str_client + '<br />' + str_professional +'<br /> Inscrito em: ' + this.dt; //+ '<br />Occurences: '+ str_occurence;
+            tableTR += '</td>';
+            tableTR += '<td>';
+            tableTR += '</td>';
+            tableTR += '</tr>';
+        });
+        
         buildTableList(tableTR, 'div#list');
         buildPaginator(app, json['paginator'], json['util'], 'div#list');
@@ -68 +67 @@
         });
     });
-
     return false;
 }

trunk/gestorpsi/service/views.py

@@ -300 +300 @@
 
 @permission_required_with_403('service.service_list')
-def client_list(request, page = 1, object_id = None, no_paging = None, initial = None, filter = None):
+def client_list(request, page=1, object_id=None, no_paging=None, initial=None, filter=None):
     array = {} # json
     i = 0
-    
     referral = Referral.objects.charged().filter(service = object_id).order_by('-date')
-
     if initial:
         referral = referral.filter(client__person__name__istartswith = initial)
-
     if filter:
         referral = referral.filter(client__person__name__icontains = filter)
-
-    array['util'] = {
-        'has_perm_read': request.user.has_perm('place.place_read'),
-    }
-
+    #array['util'] = {
+    #    'has_perm_read': request.user.has_perm('place.place_read'),
+    #}
     for r in referral:
         array[i] = {
-            'dt': r.date.strftime("%d-%m-%Y  %H:%M ")
+            'dt': r.date.strftime("%d/%m/%Y  %H:%M ")
         }
-
         list = r.upcoming_occurrences()
         sub = 0
@@ -327 +321 @@
             array[i]['occurence'][sub] = ({'p': ('%s' % p.start_time.strftime(" %d-%m-%Y  %H:%M ")) })
             sub = sub + 1
-
         sub = 0
         array[i]['professional'] = {}
@@ -333 +326 @@
             array[i]['professional'][sub] = ({'id':p.id, 'name':p.person.name})
             sub = sub + 1
-
         sub = 0
         array[i]['client'] = {}
@@ -339 +331 @@
             array[i]['client'][sub] =  ({'id':p.id, 'name':p.person.name})
             sub = sub + 1
-
         i = i + 1
 
     return HttpResponse(simplejson.dumps(array, sort_keys=True), mimetype='application/json')
-
 
 # list referral groups