Changeset 849

Timestamp:

02/07/11 17:31:01 (2 years ago)

Author:

antonio.alves

Message:

Implemented duplicated UTN validation, close #240

Location:

trunk/opentrials

Files:

• repository/trds_forms.py (modified) (2 diffs)
• reviewapp/forms.py (modified) (4 diffs)
• reviewapp/views.py (modified) (1 diff)

trunk/opentrials/repository/trds_forms.py

@@ -164 +164 @@
 #
 
+def utrn_number_validate(data):
+    if data:
+        if not re.match('^U\d{4}-\d{4}-\d{4}$', data):
+            raise forms.ValidationError(_("Invalid format. Example: U1111-1111-1111"))
+    return data
 
 ### step_1 #####################################################################
@@ -190 +195 @@
     acronym = forms.CharField(required=False, label=_('Acronym'),
                               max_length=255)
-                              
+
     def clean_utrn_number(self):
-        data = self.cleaned_data['utrn_number'].strip()
-        if data:
-            if not re.match('^U\d{4}-\d{4}-\d{4}$', data):
-                raise forms.ValidationError(_("Invalid format. Example: U1111-1111-1111"))
+        data = utrn_number_validate(self.cleaned_data['utrn_number'].strip())
+        if ClinicalTrial.objects.filter(utrn_number=data).exclude(pk=self.instance.pk).count() > 0:
+            raise forms.ValidationError(_('UTRN number already exists.'))
         return data
 

trunk/opentrials/reviewapp/forms.py

@@ -2 +2 @@
 from tempfile import NamedTemporaryFile
 import lxml
+import re
 
 from opentrials.repository.trds_forms import ReviewModelForm
@@ -17 +18 @@
 from polyglot.multilingual_forms import MultilingualModelChoiceField, MultilingualModelMultipleChoiceField
 
-from repository.models import Institution, CountryCode
+from repository.models import Institution, CountryCode, ClinicalTrial
 from repository.widgets import SelectInstitution
 from repository.xml.validate import validate_xml, InvalidOpenTrialsXML, ICTRP_DTD
 from repository.xml.loading import etree, OpenTrialsXMLImport, REPLACE_IF_EXISTS
+from repository.trds_forms import utrn_number_validate
 
 ACCESS = [
@@ -36 +38 @@
         self.user = kwargs.pop('user', None)
 
-        self.base_fields.keyOrder = ['language', 'scientific_title', 'recruitment_country',
-                'primary_sponsor',]
-
-        self.base_fields['primary_sponsor'].widget = SelectInstitution(formset_prefix='primary_sponsor')
+        self.base_fields.keyOrder = ['language', 'scientific_title', 'recruitment_country', 
+                'utrn_number', 'primary_sponsor',]
+
+        self.base_fields['primary_sponsor'] = forms.ModelChoiceField(queryset=Institution.objects.filter(creator=self.user).order_by('name'), 
+                                                label=_('Primary Sponsor'),
+                                                widget=SelectInstitution(formset_prefix='primary_sponsor'), 
+                                                required=True)
 
         super(InitialTrialForm, self).__init__(*args, **kwargs)
 
-        self.fields['primary_sponsor'].queryset = Institution.objects.filter(creator=self.user).order_by('name')
-
-        if self.user:
-            self.fields['language'] = forms.ChoiceField(label=_('Submission language'), 
-                        choices=settings.MANAGED_LANGUAGES_CHOICES, 
-                        initial=self.user.get_profile().preferred_language)
+        self.fields['language'] = forms.ChoiceField(label=_('Submission language'), 
+                    choices=settings.MANAGED_LANGUAGES_CHOICES, 
+                    initial=self.user.get_profile().preferred_language)
 
     form_title = _('Initial Trial Data')
@@ -58 +60 @@
                                                     model=CountryCode,
                                                     label_field='description',)
+    utrn_number = forms.CharField(label=_('UTRN Number'), max_length=255, required=True)
     language = forms.ChoiceField(label=_('Submission language'), 
                                  choices=settings.MANAGED_LANGUAGES_CHOICES)
+
+    def clean_utrn_number(self):
+        data = utrn_number_validate(self.cleaned_data['utrn_number'].strip())
+        if ClinicalTrial.objects.filter(utrn_number=data).count() > 0:
+            raise forms.ValidationError(_('UTRN number already exists.'))
+        return data
 
 class PrimarySponsorForm(ReviewModelForm):

trunk/opentrials/reviewapp/views.py

@@ -285 +285 @@
             trial.primary_sponsor = su.primary_sponsor
             trial.language = su.language
+            trial.utrn_number = initial_form.cleaned_data['utrn_number']
             trial.save()