Changeset 1297

Timestamp:

19/10/2009 16:02:08 (2 years ago)

Author:

sergio

Message:

Merged Tiago branch in trunk

Location:

trunk/gestorpsi

Files:

• . (modified) (1 prop)
• admission/models.py (modified) (2 diffs)
• admission/urls.py (modified) (2 diffs)
• admission/views.py (modified) (3 diffs)
• client/views.py (modified) (3 diffs)
• device/models.py (modified) (1 diff)
• media/img/16 (modified) (1 prop)
• media/js (modified) (1 prop)
• media/js/gestorpsi.forms.submit.js (modified) (1 diff)
• media/js/gestorpsi.json.js (modified) (4 diffs)
• profile/urls.py (modified) (2 diffs)
• profile/views.py (modified) (1 diff)
• referral/urls.py (modified) (2 diffs)
• referral/views.py (modified) (3 diffs)
• schedule (modified) (1 prop)
• schedule/views.py (modified) (1 diff)
• service/views.py (modified) (5 diffs)
• templates/admission/admission_form.html (modified) (3 diffs)
• templates/careprofessional/careprofessional_form.html (modified) (1 diff)
• templates/client/client_home.html (modified) (2 diffs)
• templates/client/client_referral_home.html (modified) (3 diffs)
• templates/device/device_list.html (modified) (1 prop)
• templates/employee/employee_form.html (modified) (1 diff)
• templates/organization/organization_form.html (modified) (1 diff)
• templates/place/place_room_form.html (modified) (1 diff)
• templates/profile/profile_change_pass.html (copied) (copied from branches/tiago/gestorpsi/templates/profile/profile_change_pass.html)
• templates/profile/profile_person.html (modified) (1 diff)
• templates/service/service_form.html (modified) (1 diff)
• templates/service/service_group_form.html (modified) (1 diff)
• templates/tags (modified) (1 prop)
• templates/tags/profile_sidebar.html (copied) (copied from branches/tiago/gestorpsi/templates/tags/profile_sidebar.html)

trunk/gestorpsi/admission/models.py

@@ -15 +15 @@
 """
 
+
+
+
 import reversion
 from django.db import models
+from django.utils.translation import ugettext as _
 from gestorpsi.organization.models import Organization
 from gestorpsi.careprofessional.models import CareProfessional
 from gestorpsi.client.models import Client
 from gestorpsi.util.uuid_field import UuidField
+from django.contrib.contenttypes.models import ContentType
+from django.contrib.contenttypes import generic
+
+ATTACH_TYPE = (
+    ('01', _('Termo de Consentimento Livre e Esclarecido (TCLE)')),
+)
 
 class ReferralChoice(models.Model):
@@ -47 +57 @@
 
 reversion.register(AdmissionReferral, follow=['client'])
+
+class Attach(models.Model):
+    filename = models.CharField(null=True, max_length=255)
+    description = models.TextField(null=True)
+    date = models.DateTimeField(auto_now_add=True)
+    file = models.CharField(max_length=200)
+    type = models.CharField(max_length=2, blank=True, null=True, choices=ATTACH_TYPE) 
+    client = models.ForeignKey(Client)
+    signed_bythe_client = models.BooleanField(default=True)
+
+    def __unicode__(self):
+        return u'%s' % (self.file)

trunk/gestorpsi/admission/urls.py

@@ -16 +16 @@
 
 from django.conf.urls.defaults import *
-from gestorpsi.admission.views import form, save
+from gestorpsi.admission.views import form, save, attach_save
 from gestorpsi.authentication.views import login_check
 
@@ -22 +22 @@
     (r'^(?P<object_id>[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12})/$', login_check(form)),
     (r'^(?P<object_id>[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12})/save/$', login_check(save)),  #update object
-    
+    (r'^(?P<object_id>[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12})/attach/$', login_check(attach_save)),  #attach save
 )

trunk/gestorpsi/admission/views.py

@@ -1 @@
-# -*- coding: utf-8 -*-
+#-*- coding: utf-8 -*-
 
 """
@@ -28 +28 @@
 from gestorpsi.util.views import get_object_or_None
 from gestorpsi.util.decorators import permission_required_with_403
+from gestorpsi.settings import MEDIA_ROOT
+import os
+import uuid
 
 @permission_required_with_403('admission.admission_read')
 def form(request, object_id=''):
     object = get_object_or_404(Client, pk=object_id, person__organization=request.user.get_profile().org_active)
+    attachs = Attach.objects.filter(client = object)
 
     return render_to_response('admission/admission_form.html', {
         'object': object,
+        'types': ATTACH_TYPE,
+        'attachs': attachs,
+        'org_id': request.user.get_profile().org_active.id,
         'contact_organizations':  Contact.objects.filter(
                         org_id = request.user.get_profile().org_active.id, 
@@ -78 +85 @@
 
     return HttpResponseRedirect('/client/%s/home' % object.id)
+
+def attach_save(request, object_id = None):
+    object = get_object_or_404(Client, pk = object_id)
+
+    if request.method == 'POST':
+        user = request.user
+        filename = ''
+
+        if 'file' in request.FILES:
+            path = '%simg/organization/%s' % (MEDIA_ROOT, user.get_profile().org_active.id)
+            if not os.path.exists(path):
+                os.mkdir(path)
+                os.chmod(path, 0777)
+
+            path = '%simg/organization/%s/attach' % (MEDIA_ROOT, user.get_profile().org_active.id)
+            if not os.path.exists(path):
+                os.mkdir(path)
+                os.chmod(path, 0777)
+
+            try:
+                    filename = request.FILES['file']
+                    file = str(uuid.uuid4()) + '.'+ (str(filename).split('.')[-1])
+                    destination = open('%s/%s' % (path,  file), 'w+')
+
+                    for chunk in filename.chunks():
+                        destination.write(chunk)
+                    destination.close()
+
+                    attach = Attach()
+                    if not request.POST.get('signed'):
+                        attach.signed_bythe_client = False
+                    else:
+                        attach.signed_bythe_client = True
+
+                    attach.filename = '%s' %  filename
+                    attach.description = request.POST.get('description')
+                    attach.file = '%s' % file
+                    attach.type = request.POST.get('doc_type')
+                    attach.client = object
+                    attach.save()
+
+            except IOError:
+                print "error sending file"
+
+        return HttpResponseRedirect('/admission/%s/' % object_id)
+        return HttpResponseRedirect('/admission/%s/' % object_id)

trunk/gestorpsi/client/views.py

@@ -74 +74 @@
     referrals_discharged = Referral.objects.discharged().filter(client=object)
 
+    c=0
+    for x in (Referral.objects.filter(client=object)):
+        c += x.past_occurrences().count()
+
     return render_to_response('client/client_home.html',
                                         {
@@ -79 +83 @@
                                         'referrals': referrals,
                                         'referrals_discharged': referrals_discharged,
-                                        'clss':request.GET.get('clss')
+                                        'service_subscribers': Service.objects.filter(referral__client = object).distinct().count(),
+                                        'care_delivered': c,
+                                                        'clss':request.GET.get('clss')
                                         },
                                         context_instance=RequestContext(request))
@@ -429 +435 @@
 
     clss = request.GET.get("clss")
-    dt = referral.date.strftime("%d-%m-%Y  %H:%M %p")
+    dt = referral.date.strftime("%d-%m-%Y  %H:%M ")
     try:
         indication = Indication.objects.get(referral = referral_id)

trunk/gestorpsi/device/models.py

@@ -99 +99 @@
 
     def __unicode__(self):
-      return u"%s - %s - %s" % (self.device.description, self.brand, self.model,)
+#      return u"%s - %s - %s" % (self.device.description, self.brand, self.model,)
+      return u"%s - %s - %s" % (self.model, self.brand, self.device.description,)
 
     def revision(self):

trunk/gestorpsi/media/js/gestorpsi.forms.submit.js

@@ -14 +14 @@
 
 */
+     /**
+      *  My Record - Profile
+      * _description:
+      * change password of loged user
+      *
+      */
 
 $(function() {
+
+    $('form.record_chpass').validate({
+        rules: {
+            c_pass: "required",
+            n_pass: "required",
+            n_pass0: "required"
+        },
+        messages: {
+            name: 'Preenchimento Necessário'
+        }
+    });
 
      /**

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

@@ -37 +37 @@
               str_professional = '';
               str_professional_id = '';
+              str_occurence = '';
 
               if (this.professional){
@@ -44 +45 @@
                     });
                 }
+
+              if (this.occurence){
+               jQuery.each(this.occurence,  function(){
+                        str_occurence += ' ('+ this.p + ')';
+                    });
+                }
  
                 tableTR += '<tr>';
-                tableTR += '<td class="title">'+ str_client +'  '+ str_professional +'<br> data ' + this.dt;
-                tableTR += '</td>';
-                tableTR += '<td></td>';
+                tableTR += '<td class="title">'+ str_client +' '+ str_professional +'<br /> Date ' + this.dt + '<br />Occurences: '+ str_occurence;
+                tableTR += '</td>';
+                tableTR += '<td>';
+//                tableTR += '<a href="www.gestorpsi.com.br">lnk</a>';
+                tableTR += '</td>';
                 tableTR += '</tr>';
         });
@@ -545 +554 @@
 }
 
+/***
+ * service group select; details about referral , professionals
+ */
 function referralMultSelect(url) {
     $.getJSON(url, function(json) {
@@ -550 +562 @@
                     $('form div.main_area div select#m-selectable').append(new Option(this.client + this.prof0 + this.prof1 + this.prof2 , this.id));
                 });
-            });
-}
+    });
+}

trunk/gestorpsi/profile/urls.py

@@ -16 +16 @@
 
 from django.conf.urls.defaults import *
-from gestorpsi.profile.views import form, save, form_careprofessional, save_careprofessional
+from gestorpsi.profile.views import form, save, form_careprofessional, save_careprofessional, change_pass
 from gestorpsi.authentication.views import login_check
 
@@ -24 +24 @@
     (r'^save/$', login_check(save)), #save new object
     (r'^save/careprofessional/$', login_check(save_careprofessional)), #save new object
+    (r'^chpass/$', login_check(change_pass)), #change password
 )

trunk/gestorpsi/profile/views.py

@@ -90 +90 @@
     request.user.message_set.create(message=_('Professional profile saved successfully'))
     return HttpResponseRedirect('/profile/careprofessional/')
+
+def change_pass(request):
+    object = get_object_or_404(CareProfessional, pk=request.user.get_profile().person.careprofessional.id)
+
+    clss = request.GET.get("clss")
+
+    if request.POST.get('c_pass'):
+        if not object.person.profile.user.check_password(request.POST.get("c_pass")):
+            request.user.message_set.create(message=_('The current password is wrong'))
+            return HttpResponseRedirect('/profile/chpass/?clss=error')
+        else:
+            if request.POST.get("n_pass") != request.POST.get("n_pass0"):
+                request.user.message_set.create(message=_('The confirmation of the new password is wrong'))
+                return HttpResponseRedirect('/profile/chpass/?clss=error')
+            else:
+                object.person.profile.user.set_password(request.POST.get('n_pass'))
+                object.person.profile.temp = request.POST.get('n_pass')    # temporary field (LDAP)
+                object.person.profile.save(force_update=True)
+                object.person.profile.user.save(force_update=True)
+                request.user.message_set.create(message=_('Password updated successfully'))
+                return HttpResponseRedirect('/profile/chpass')
+    else:
+        return render_to_response('profile/profile_change_pass.html', locals(), context_instance=RequestContext(request))

trunk/gestorpsi/referral/urls.py

@@ -17 +17 @@
 from django.conf.urls.defaults import *
 from gestorpsi.authentication.views import login_check
-from gestorpsi.referral.views import referral_off, client_referrals
+from gestorpsi.referral.views import referral_off, client_referrals, mult_select
 
 
@@ -26 +26 @@
     (r'^(?P<object_id>\d+)/off/$', login_check(referral_off)),
     #(r'^save/$', login_check(save)),
+    (r'^multselect/(?P<object_id>[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12})/$', login_check(mult_select)),
 )

trunk/gestorpsi/referral/views.py

@@ -69 +69 @@
         form = ReferralGroupForm()
         client_form = ReferralClientForm()
-        client_form.fields['client'].queryset = Client.objects.filter(person__organization = request.user.get_profile().org_active.id, clientStatus = '1', referral__service = object).distinct()
+        #client_form.fields['client'].queryset = Client.objects.filter(person__organization = request.user.get_profile().org_active.id, clientStatus = '1', referral__service = object).distinct()
 
     return render_to_response('service/service_group_form.html',
@@ -76 +76 @@
                                 'client_form': client_form,
                                 'hide_service_actions': True,
+#                                'clients': Client.objects.filter(person__organization = request.user.get_profile().org_active.id, clientStatus = '1', referral__service = object).distinct(),
+                                'clients': Referral.objects.filter(organization = request.user.get_profile().org_active, status = '01', service = object).distinct(),
                                },
                               context_instance=RequestContext(request)
@@ -164 +166 @@
     return HttpResponse(array, mimetype='application/json')
 
+
+@permission_required_with_403('referral.referral_list')
+def mult_select(request, object_id = None):
+    print "M U L T"
+    object = get_object_or_404(Service, pk=object_id, organization = request.user.get_profile().org_active)
+#    object = get_object_or_404(Client, pk=object_id, person__organization=request.user.get_profile().org_active)
+#    referral = Referral.objects.charged().filter(client=object, service__organization=request.user.get_profile().org_active)
+
+    referrals = Referral.objects.filter(organization = request.user.get_profile().org_active, status = '01', service = object).distinct()
+
+    array = {} #json
+    i = 0
+
+    for o in referrals:
+        prof0 = ''
+        prof1 = ''
+        prof2 = ''
+
+        try:
+            prof0 = '%s' % o.professional.all()[0]
+            prof0 = ('(%s' ' %s)' % (prof0.split(' ')[0], prof0.split(' ')[1][0]))
+
+            prof1 = '%s' % o.professional.all()[1]
+            prof1 = ('(%s' ' %s)' % (prof1.split(' ')[0], prof1.split(' ')[1][0]))
+
+            prof2 = '%s' % o.professional.all()[2]
+            prof2 = ('(%s' ' %s)' % (prof2.split(' ')[0], prof2.split(' ')[1][0]))
+
+        except:
+            pass
+
+        array[i] = {
+            'client': '%s' % o.client.all()[0],
+            'id': '%s' % o.client.all()[0].id,
+            'prof0': ' %s' % prof0,
+            'prof1': ' %s' % prof1,
+            'prof2': ' %s' % prof2,
+        }
+        i = i + 1
+
+    array = simplejson.dumps(array, encoding = 'iso8859-1')
+
+    return HttpResponse(array, mimetype='application/json')

trunk/gestorpsi/schedule/views.py

@@ -126 +126 @@
             ))
 
-        recurrence_form.fields['device'].queryset = DeviceDetails.objects.filter(Q(room = room, mobility="1") | Q(place =  room.place, room__place__organization = request.user.get_profile().org_active, mobility="2", lendable=False) | Q(room__place__organization = request.user.get_profile().org_active, mobility="2", lendable=True))
+        recurrence_form.fields['device'].queryset = DeviceDetails.objects.filter(Q(room = room, mobility="1") | Q(place =  room.place, room__place__organization = request.user.get_profile().org_active, mobility="2", lendable=False) | Q(room__place__organization = request.user.get_profile().org_active, mobility="2", lendable=True, active=True))
 
     return render_to_response(

trunk/gestorpsi/service/views.py

@@ -267 +267 @@
 def queue(request, object_id=None):
     object = get_object_or_404(Service, pk=object_id, organization=request.user.get_profile().org_active)
-    queue = Queue.objects.filter(referral__service = object_id, date_out = None).order_by('date_in').order_by('priority')
-
-    list_queue = Referral.objects.filter(queue__referral__service = object_id, queue__date_out = None).order_by('date').order_by('-priority')
+    queue = Queue.objects.filter(referral__service = object_id, date_out = None).order_by('-date_in')
+
+    list_queue = Referral.objects.filter(queue__referral__service = object, queue__date_out = None).order_by('-queue__date_in')
 
     return render_to_response( "service/service_queue.html", {
@@ -276 +276 @@
         }, context_instance=RequestContext(request))
 
-@permission_required_with_403('service.service_list')
 def client_list_index(request, object_id = None):
     object = get_object_or_404(Service, pk=object_id, organization=request.user.get_profile().org_active)
@@ -287 +286 @@
     i = 0
     
-    referral = Referral.objects.charged().filter(service = object_id).order_by('date')
+    referral = Referral.objects.charged().filter(service = object_id).order_by('-date')
 
     if initial:
@@ -297 +296 @@
     for r in referral:
         array[i] = {
-            'dt': r.date.strftime("%d-%m-%Y  %H:%M %p")
+            'dt': r.date.strftime("%d-%m-%Y  %H:%M ")
         }
-        
-        sub = 0;
+
+        list = r.upcoming_occurrences()
+        sub = 0
+        array[i]['occurence'] = {}
+        for p in list:
+            array[i]['occurence'][sub] = ({'p': ('%s' % p.start_time.strftime(" %d-%m-%Y  %H:%M ")) })
+            sub = sub + 1
+
+        sub = 0
         array[i]['professional'] = {}
         for p in r.professional.all():
@@ -306 +312 @@
             sub = sub + 1
 
-        sub = 0;
+        sub = 0
         array[i]['client'] = {}
         for p in r.client.all():

trunk/gestorpsi/templates/admission/admission_form.html

@@ -36 +36 @@
         <p class="description">{% trans "Inform the client details then click on Save button" %}</p>
 {% endif %}
-
 </p>
 <h2 id="title_contacts" style="display:none"></h2>
@@ -65 +64 @@
         <input name="admission_date" type="text" class="medium" value="{% if not object.admission_date %}{% now "d/m/Y" %}{% else %}{{ object.admission_date|date:"d/m/Y" }}{% endif %}" mask="99/99/9999" /></label>
         </fieldset>
- {% for i in banana %}ae
-                                {{ i }}
-                        {% endfor %}
         <!-- How the client heard about this organization -->
         <div class="admission_referral">
@@ -142 +138 @@
 </div>
 
-<div id="sidebar" class="sidebar">
-    {% if perms.client.client_write %}
-        <div class="bg_blue">
-            {% include "tags/save.html" %}
-        </div>
+    <div id="sidebar" class="sidebar">
+        {% if perms.client.client_write %}
+            <div class="bg_blue">
+                {% include "tags/save.html" %}
+            </div>
+        {% endif %}
+        {% if object.id %}
+            {% include "tags/client_sidebar.html" %}
+        {% endif %}
+    </div>
+
+</form>
+
+
+<input type="hidden" name="object_id" value="{{ object.id }}" />
+
+<h2 id="title_addressbook" style="display:none"></h2>
+
+        <h2 class="title_clients title">{{ object.person.name }} {% trans "in" %} {{ referral }}</h2>
+        <p class="description">{% trans "Client subscribed in this service since" %} {{ referral.date|date:"d" }} {% trans "of" %} {{ referral.date|date:"F" }} {% trans "of" %} {{ referral.date|date:"Y" }}<br />
+
+</p>
+
+<div class="main_area">
+<form action="/admission/{{ object.id}}/attach/" method="post" name="attach" enctype="multipart/form-data" class="upload_referral">
+
+<fieldset>
+ <legend>{% trans "Media" %}</legend>
+        <div id="documents">
+                <!-- Aparece quando "Anexar Documento", desaparece após
+ enviar arquivo, podem haver vários-->
+                <div class="documents_form">
+                <label>{% trans "File" %}<br />
+
+                <input type="file" class="file" name="file" />
+
+                </label>
+                <label>{% trans "Document Type" %}<br />
+                    <select name="doc_type" class="big">
+                            {% for type in types %}
+                                <option value="{{ type.0 }}">{{ type.1 }}</option>
+                            {% endfor %}
+                    </select>
+                    <label>
+                       <input type="checkbox" name="signed" id="signed" checked="checked">&nbsp;
+                       {% trans "Asigned by the client" %}
+                    </label>
+                </label>
+
+                <label>{% trans "Document Subject" %}<br />
+                <input name="description" type="text" class="big" /></label>
+                <label><input name="" type="submit" class="btn" value="{% trans "Send file" %}" /></label>
+                </div>
+
+                <br class="newline" />
+                <br />
+
+    {% if attachs %}
+        {% for a in attachs %}
+                <table class="nozebra">
+                        <tr>
+                                <td nowrap="nowrap"><span class="date">{{ a.date|date:"d-m-Y" }} </span><br /><span class="time">{{ a.date|date:"P" }}</span></td>
+                                <td><span  class="pdf"><a href="/media/img/organization/{{ org_id }}/attach/{{ a.file }}" target="_blank">{{ a.filename }}</a></span></td>
+                                <td><span>{{ a.description }} {% for t in types %}{% ifequal a.type t.0 %} {{ t.1 }} </span> <br /> {% endifequal %} {% endfor %} 
+                                    <td><span>{% if a.signed_bythe_client %}{% trans "Signed by the client" %}{% endif %}</span></td>
+                        </tr>
+                </table>
+        {% endfor %}
+    {% else %}
+             <p class="empty">Nenhum documento anexado</p>
+             <br />
     {% endif %}
-    {% if object.id %}
-        {% include "tags/client_sidebar.html" %}
-    {% endif %}
+
+   </fieldset>
+  </form>
+ <br />
 </div>
 </form>

trunk/gestorpsi/templates/careprofessional/careprofessional_form.html

@@ -140 +140 @@
 <fieldset class="comment_form">
         <legend>{% trans "Comments" %}</legend>
-        <label>{% trans "Comments" %}<br />
+        <label>
                 <textarea name="comments" class="extrabig">{{ object.person.comments }}</textarea>
         </label>

trunk/gestorpsi/templates/client/client_home.html

@@ -31 +31 @@
 <h2 id="title_addressbook" style="display:none"></h2>
 
-        <h2 class="title_clients title">{{ object.person.name }}</h2>
-        <p class="description">{% trans "Customer subscribed in" %} <a href="/client/{{ object.id }}/referral/">{{ referrals|length }} {% trans "service(s)" %}</a> <br />      
-
-</p>
+    <h2 class="title_clients title">{% trans "Details of Client"%} </h2>
+    <p class="description">{% trans "Customer subscribed in" %} <a href="/client/{{ object.id }}/referral/">{{ referrals|length }} {% trans "service(s)" %}</a>&nbsp;
+        {% trans "Admission Date" %} ( {{ object.admission_date|date:"d-m-Y" }} ) &nbsp; 
+        {% trans "Subscribers" %} ( {{ service_subscribers }} )  &nbsp; 
+        {% trans "Care delivery" %} ( {{ care_delivered }} ) 
+    </p>
 
 <div class="main_area home">
         <!-- <a href="" id="help">&nbsp;</a> -->
         <!-- DataTypes form menu -->
-        <h3><span>{% trans "Administrative Details" %}</span></h3>
+        <h3><span>{% trans "registration information" %}</span></h3>
     <div class="photo">
         <img class="img_people" src="{% if object.person.photo %}/media/img/organization/{{ user.get_profile.org_active.id }}/.thumb/{{ object.person.photo }}{% else %}/media/img/generic_photo.gif{% endif %}" />
         <br /><br />
     </div>    
-    <h1>{{ object }}</h1>
+    <h1>{{ object }} ( {{ object.person.nickname }} )</h1>
     <p><span class="big">{% if object.person.maritalStatus %}{{ object.person.maritalStatus }}{% endif %}</span></p>
     <p><span class="big">{% if object.person.birthDate %}{{ object.person.birthDate|age }} {% trans "years old" %} {% endif %}</span></p>
@@ -90 +92 @@
                 <a href="/client/{{ object.id}}/referral/{{ i.id }}/">{{ i.service }}</a> {% if i.upcoming_occurrences %} {% trans "with" %} {{ i.upcoming_occurrences|length }} {% trans "occurrences remaining" %}{% endif %}<br />
                 {% for p in i.professional.all %}
-                    <b>{{ p }}</b> {% for i in p.person.phones.all %} {{ i }} {{ i.phoneType }} {% endfor %}{{ p.person.get_first_email }}<br />
+                <b>{{ p }}</b> {{ p.professionalIdentification.profession }} - {{ p.professionalIdentification.profession.symbol }}&nbsp;{{ p.professionalIdentification }} <br />
                 {% endfor %}
                     {% if i.next_occurrence %}

trunk/gestorpsi/templates/client/client_referral_home.html

@@ -32 +32 @@
 
         <h2 class="title_clients title">{{ object.person.name }}</h2>
-        <p class="description"><br /></p>
-
-
+    <p class="description"><br /></p>
 
 <div class="main_area home">
         <!-- <a href="" id="help">&nbsp;</a> -->
         <!-- DataTypes form menu -->
-        <h3><span>{% trans "Administrative Details" %}</span></h3>
+        <h3><span>{% trans "registration information" %}</span></h3>
     <div class="photo">
         <img class="img_people" src="{% if object.person.photo %}/media/img/organization/{{ user.get_profile.org_active.id }}/.thumb/{{ object.person.photo }}{% else %}/media/img/generic_photo.gif{% endif %}" />
@@ -45 +43 @@
     </div>    
     <h1>{{ object.person.name }}</h1>
+    <p><span class="big">{% if object.person.nickname %}{{ object.person.nickname }}{% endif %}</span></p>
     <p><span class="big">{% if object.person.maritalStatus %}{{ object.person.maritalStatus }}{% endif %}</span></p>
     <p><span class="big">{% if object.person.birthDate %}{{ object.person.birthDate|age }} {% trans "years" %} {% endif %}</span></p>
@@ -92 +91 @@
                 {% trans "There is no professional in this referral." %} <a href="/client/{{ object.id}}/referral/{{ referral.id }}/form/">{% trans "Add one now?" %}</a>
             {% else %}
-                {% trans "Professionals" %}: {{ referral.professional_list|safeseq|join:", "}}
-            {% endif %}
-            <br>
-            {% trans "Client subscribed on this service since" %} {{ referral.date|date:"d" }} {% trans "of" %} {{ referral.date|date:"F" }} {% trans "of" %} {{ referral.date|date:"Y" }}
-        </p>
-
-        <p>
-            {% if dt %}
-            <b />{% trans "Data" %}</b><br />
-                {{ dt }}
-            {% endif %}
-        </p>
+                    {% trans "Professionals" %}: {{ referral.professional_list|safeseq|join:", "}}
+                {% endif %}
+            <br>
+            {% trans "Client subscribed on this service since" %} {{ dt }} 
+        </p>
+
         <p>
             {% if referral.referral %}

trunk/gestorpsi/templates/employee/employee_form.html

@@ -79 +79 @@
 <fieldset class="comment_form">
         <legend>{% trans "Comments" %}</legend>
-        <label>{% trans "Comments" %}<br />
+        <label>
                 <textarea name="comments" class="extrabig">{{ object.person.comments }}</textarea>
         </label>

trunk/gestorpsi/templates/organization/organization_form.html

@@ -254 +254 @@
 <fieldset id="fieldset_place_status" class="identity organization">
         <legend>{% trans "Comments" %}</legend>
-        <label>{% trans "Comments" %}<br />
-                <textarea name="comment" class="extrabig">{{ object.comment }}</textarea>
-        </label>
+        <label>
+        <textarea name="comment" class="extrabig">{{ object.comment }}</textarea>
+    </label>
 </fieldset>
 

trunk/gestorpsi/templates/place/place_room_form.html

@@ -89 +89 @@
 <fieldset class="comment_form">
         <legend>{% trans "Comments" %}</legend>
-        <label>{% trans "Comments" %}<br />
+        <label>
                 <textarea name="comments" class="extrabig">{{ object.comments }}</textarea>
         </label>

trunk/gestorpsi/templates/profile/profile_person.html

@@ -45 +45 @@
             {% include "tags/save.html" %}
           </div>
+
+          <div>
+                {% include "tags/profile_sidebar.html" %}
+          </div>
 </div>
 

trunk/gestorpsi/templates/service/service_form.html

@@ -160 +160 @@
 <fieldset class="comment_form">
         <legend>{% trans "Comments" %}</legend>
-        <label>{% trans "Comments" %}<br />
+        <label>
                 <textarea name="comments" class="extrabig">{{ object.comments }}</textarea>
         </label>

trunk/gestorpsi/templates/service/service_group_form.html

@@ -68 +68 @@
 
     <fieldset>
-    <legend>{% trans "Group Members" %}</legend>
-        <label>{% trans "Clients" %}<br /></label>
+    <legend>Group Members</legend>
+        <label>Clients<br /></label>
         <div>
-        {{ client_form.client }}
-        {{ client_form.client.errors }}
+            <select multiple="multiple" id="id_client" class="giant high multiple multiselectable" name="client">
+                <script>
+                    referralMultSelect('/referral/multselect/{{ object.id }}/');
+                </script>
+            </select>
         </div>
-        
     </fieldset>
-    
+
+
 <br />