Changeset 570

Timestamp:

08/17/10 12:05:53 (3 years ago)

Author:

rafael.soares

Message:

added field helpers in new submission, close #169

Location:

trunk/opentrials/reviewapp

Files:

• forms.py (modified) (4 diffs)
• templates/reviewapp/new_submission.html (modified) (2 diffs)

trunk/opentrials/reviewapp/forms.py

@@ -4 +4 @@
 from opentrials.reviewapp.models import Remark
 from opentrials.reviewapp.models import UserProfile
-from opentrials.reviewapp.models import Attachment
+from opentrials.reviewapp.models import Attachment, Submission
 from django import forms
 from django.utils.translation import ugettext as _
@@ -18 +18 @@
 
 
-class InitialTrialForm(forms.Form):
+class InitialTrialForm(ReviewModelForm):
+    class Meta:
+        model = Submission
+        exclude = ['primary_sponsor', 'trial', 'status', 'staff_note', 'title']
+        
     def __init__(self, *args, **kwargs):
         self.user = kwargs.pop('user', None)
@@ -24 +28 @@
         if self.user:
             self.fields['language'] = forms.ChoiceField(label=_('Submission language'), 
-                        choices=settings.MANAGED_LANGUAGES_CHOICES, initial=self.user.get_profile().preferred_language)
+                        choices=settings.MANAGED_LANGUAGES_CHOICES, 
+                        initial=self.user.get_profile().preferred_language)
             
     form_title = _('Initial Trial Data')
@@ -36 +41 @@
                                  choices=settings.MANAGED_LANGUAGES_CHOICES)
     
-class PrimarySponsorForm(forms.ModelForm):
+class PrimarySponsorForm(ReviewModelForm):
     class Meta:
         model = Institution

trunk/opentrials/reviewapp/templates/reviewapp/new_submission.html

@@ -1 +1 @@
 {% extends "base.html" %}
 {% load i18n %}
+
+{% block extrahead %}
+        <script type="text/javascript">
+            $(document).ready(function() {
+                $("select[multiple]").asmSelect({
+                        addItemTarget: 'bottom',
+                        animate: true,
+                        highlight: true,
+                        sortable: false
+                });
+                $('.dataTable th img').cluetip({sticky: true, closePosition: 'title',local:true, cursor: 'pointer'});
+            });
+        </script>
+{% endblock %}
 
 {% block stepmenu_top %}
@@ -11 +25 @@
 
 {% block body %}
-
-<script type="text/javascript">
-    //{# From http://stackoverflow.com/questions/501719/dynamically-adding-a-form-to-a-django-formset-with-ajax#669982 */ #}
-    function cloneMore(selector, type) {
-        var newElement = $(selector).clone(true);
-        var total = $('#id_' + type + '-TOTAL_FORMS').val();
-        newElement.find(':input').each(function() {
-            var name = $(this).attr('name').replace('-' + (total-1) + '-','-' + total + '-');
-            var id = 'id_' + name;
-            $(this).attr({'name': name, 'id': id}).val('').removeAttr('checked');
-        });
-        newElement.find('label').each(function() {
-            var newFor = $(this).attr('for').replace('-' + (total-1) + '-','-' + total + '-');
-            $(this).attr('for', newFor);
-        });
-        total++;
-        $('#id_' + type + '-TOTAL_FORMS').val(total);
-        newElement.css("display","none");
-        $(selector).after(newElement);
-        newElement.show("fast");
-    }
-
-    $(document).ready(function() {
-            $("input#addmore").click(function(){
-                cloneMore('table:last','form');
-            });
-            $("select[multiple]").asmSelect({
-                    addItemTarget: 'bottom',
-                    animate: true,
-                    highlight: true,
-                    sortable: false
-            });
-    });
-</script>
 
 <form method="post" action="/accounts/newsubmission/" enctype="multipart/form-data">{% csrf_token %}