Changeset 706

Timestamp:

11/24/10 17:08:51 (2 years ago)

Author:

jose.brandao

Message:

Registered trial detail page changed to show fossil

Location:

trunk/opentrials

Files:

• repository/models.py (modified) (1 diff)
• repository/templates/repository/clinicaltrial_detail.html (modified) (6 diffs)
• repository/templates/repository/clinicaltrial_list.html (modified) (1 diff)
• repository/urls.py (modified) (1 diff)
• repository/views.py (modified) (3 diffs)
• vocabulary/models.py (modified) (1 diff)

trunk/opentrials/repository/models.py

@@ -102 +102 @@
             ret = obj.get_object_fossil()
             ret._language = language
+            ret.hash_code = obj.pk
+            ret.previous_revision = obj.previous_revision
             return ret
 

trunk/opentrials/repository/templates/repository/clinicaltrial_detail.html

@@ -178 +178 @@
         <li>
             <span class="label">{% trans 'Primary Sponsor' %}:</span>
-            <span class="value">{{ object.primary_sponsor }}</span>
+            <span class="value">{{ object.primary_sponsor.name }}</span>
         </li>
         {% if object.secondary_sponsors %}
@@ -187 +187 @@
                 <li class="{% cycle 'even' 'odd' %}">
                     <span class="label">{% trans 'Institution' %}:</span>
-                    <span class="value">{{ sponsors.institution }}</span>
+                    <span class="value">{{ sponsors.institution.name }}</span>
                 </li>
             {% endfor %}
@@ -345 +345 @@
         <li>
             <span class="label">{% trans 'Recruitment Status' %}:</span>
-            <span class="value">{{ object.recruitment_status }}</span>
+            <span class="value">{{ object.recruitment_status.description }}</span>
         </li>
         <li class="subset">
             <span class="legend">{% trans 'Recruitment Country' %}</span>
             <ul>
-            {% for recruitment in object.trial_recruitment_country %}
+            {% for recruitment in object.trial_recruitment_country.description %}
                 <li>{{ recruitment.description }}{% if not forloop.last %}, {% endif %}</li>
             {% endfor %}
@@ -422 +422 @@
                 <div class="title">
                     <h2>{{ t.language }}</h2>
-                    <p>{{ t.study_design }}</p>
-                </div>
-                {% endif %}
-            {% endfor %}
-            {% if object.study_design|linebreaksbr %}
-                <div class="title">
-                    <h2>en</h2>
-                    <p>{{ object.study_design|linebreaksbr }}</p>
+                    <p>{{ t.study_design.description }}</p>
+                </div>
+                {% endif %}
+            {% endfor %}
+            {% if object.study_design.description|linebreaksbr %}
+                <div class="title">
+                    <h2>en</h2>
+                    <p>{{ object.study_design.description|linebreaksbr }}</p>
                 </div>
             {% endif %}
@@ -447 +447 @@
                 <tr>
                     <td><span class="value">{{ object.expanded_access_program }}</span></td>
-                    <td><span class="value">{{ object.purpose }}</span></td>
-                    <td><span class="value">{{ object.intervention_assignment }}</span></td>
+                    <td><span class="value">{{ object.purpose.description }}</span></td>
+                    <td><span class="value">{{ object.intervention_assignment.description }}</span></td>
                     <td><span class="value">{{ object.number_of_arms }}</span></td>
-                    <td><span class="value">{{ object.masking }}</span></td>
-                    <td><span class="value">{{ object.allocation }}</span></td>
-                    <td><span class="value">{{ object.phase }}</span></td>
+                    <td><span class="value">{{ object.masking.description }}</span></td>
+                    <td><span class="value">{{ object.allocation.description }}</span></td>
+                    <td><span class="value">{{ object.phase.description }}</span></td>
                 </tr>
             </table>
@@ -653 +653 @@
     </ul>
 
+    {% if object.previous_revision %}
+    <div>
+        <a href="{% url repository.trial_registered trial_fossil_id=obj.previous_revision.pk %}">{% trans 'Previous Revision' %}</a>
+    </div>
+    {% endif %}
+
     {% block attachs %}{% endblock %}
     

trunk/opentrials/repository/templates/repository/clinicaltrial_list.html

@@ -18 +18 @@
                 <td class="trial_label" width="50%">{% trans 'Title' %}</td>
                 <td class="trial_label" width="30%">{% trans 'Primary Id Number' %}</td>
-                <td class="trial_content" width="20%"><a href="{% url repository.trial_registered ct.trial_id %}">{{ ct.trial_id }}</a></td>
+                <td class="trial_content" width="20%"><a href="{% url repository.trial_registered ct.hash_code %}">{{ ct.trial_id }}</a></td>
             </tr>
             <tr>
-                <td class="trial_title" rowspan="2"><a href="{% url repository.trial_registered ct.trial_id %}">{{ ct.main_title }}</a></td>
+                <td class="trial_title" rowspan="2"><a href="{% url repository.trial_registered ct.hash_code %}">{{ ct.main_title }}</a></td>
                 <td class="trial_label">{% trans 'Recruitment Status' %}</td>
                 <td class="trial_content">{{ ct.rec_status }}</td>

trunk/opentrials/repository/urls.py

@@ -31 +31 @@
     #public
     url(r'^recruiting/$', recruiting, name='repository.recruiting'),
-    url(r'^(?P<trial_id>[0-9A-Za-z-]+)/$', trial_registered, name='repository.trial_registered'),
+    url(r'^(?P<trial_fossil_id>[0-9A-Za-z-]+)/$', trial_registered, name='repository.trial_registered'),
     url(r'^$', index, name='repository.index'),
 )

trunk/opentrials/repository/views.py

@@ -42 +42 @@
 
 from fossil.fields import DictKeyAttribute
+from fossil.models import Fossil
 
 from utilities import user_in_group
@@ -247 +248 @@
     if q:
         object_list = object_list.filter(serialized__icontains=q)
-        #object_list = ClinicalTrial.published.filter(Q(scientific_title__icontains=q)
-        #                                       |Q(public_title__icontains=q)
-        #                                       |Q(trial_id__iexact=q)
-        #                                       |Q(acronym__iexact=q)
-        #                                       |Q(acronym_expansion__icontains=q)
-        #                                       |Q(scientific_acronym__iexact=q)
-        #                                       |Q(scientific_acronym_expansion__icontains=q))
 
     object_list = object_list.proxies(language=request.LANGUAGE_CODE)
-
-    """
-    for obj in object_list:
-        try:
-            trans = obj.translations.get(language__iexact=request.LANGUAGE_CODE)
-        except ClinicalTrialTranslation.DoesNotExist:
-            trans = None
-        
-        if trans:
-            if trans.public_title:
-                obj.public_title = trans.public_title
-            if trans.public_title:
-                obj.scientific_title = trans.scientific_title
-        
-        if obj.recruitment_status:
-            try:
-                rec_status_trans = obj.recruitment_status.translations.get(language__iexact=request.LANGUAGE_CODE)
-            except VocabularyTranslation.DoesNotExist:
-                rec_status_trans = obj.recruitment_status
-            obj.rec_status = rec_status_trans.label
-    """
     
     # pagination
@@ -334 +307 @@
                                 context_instance=RequestContext(request))
                                 
-def trial_registered(request, trial_id):
+def trial_registered(request, trial_fossil_id):
     ''' show details of a trial registered '''
-    ct = get_object_or_404(ClinicalTrial, trial_id=trial_id, status='published')
-    translations = [t for t in ct.translations.all()]
+    fossil = get_object_or_404(Fossil, pk=trial_fossil_id)
+    ct = fossil.get_object_fossil()
+    translations = ct.translations
     return render_to_response('repository/clinicaltrial_detail.html',
                                 {'object': ct,

trunk/opentrials/vocabulary/models.py

@@ -44 +44 @@
         json = {
             'label': self.label,
+            'description': self.description,
             'translations': [trans.serialize_for_fossil(as_string) for trans in self.translations.all()],
             }