diff options
Diffstat (limited to 'archaeological_operations')
| -rw-r--r-- | archaeological_operations/forms.py | 11 | ||||
| -rw-r--r-- | archaeological_operations/templates/ishtar/sheet_operation.html | 2 | ||||
| -rw-r--r-- | archaeological_operations/views.py | 2 |
3 files changed, 13 insertions, 2 deletions
diff --git a/archaeological_operations/forms.py b/archaeological_operations/forms.py index 0b2555148..7cd076dec 100644 --- a/archaeological_operations/forms.py +++ b/archaeological_operations/forms.py @@ -235,10 +235,21 @@ class OperationFormGeneral(forms.Form): operator_reference = forms.CharField(label=_(u"Operator reference"), required=False, max_length=20) if settings.COUNTRY == 'fr': + negative_result = forms.NullBooleanField(required=False, + label=u"Résultat considéré comme négatif") code_patriarche = forms.IntegerField(label=u"Code PATRIARCHE", required=False) code_dracar = forms.CharField(label=u"Code DRACAR", required=False, validators=[validators.MaxLengthValidator(10)]) + cira_date = forms.DateField(label=u"Date avis CIRA", required=False, + widget=widgets.JQueryDate) + cira_rapporteur = forms.IntegerField(label=u"Rapporteur CIRA", + widget=widgets.JQueryAutoComplete(reverse_lazy('autocomplete-person', + args=["_".join( + [unicode(PersonType.objects.get(txt_idx='head_scientist').pk), + unicode(PersonType.objects.get(txt_idx='sra_agent').pk)])]), + associated_model=Person, new=True), + validators=[valid_id(Person)], required=False) comment = forms.CharField(label=_(u"Comment"), widget=forms.Textarea, required=False) diff --git a/archaeological_operations/templates/ishtar/sheet_operation.html b/archaeological_operations/templates/ishtar/sheet_operation.html index 2fab55a39..6fdcfe62d 100644 --- a/archaeological_operations/templates/ishtar/sheet_operation.html +++ b/archaeological_operations/templates/ishtar/sheet_operation.html @@ -87,7 +87,7 @@ {% for act in item.administrative_act.all %} <tr> <td>{{act.signature_date.year}}</td> - <td>{{act.ref_sra}}</td> + <td>{% if act.ref_sra %}{{act.ref_sra}}{% endif %}</td> <td class='string'>{{act.act_type}}</td> <td class="string">{{act.signature_date}}</td> </tr> diff --git a/archaeological_operations/views.py b/archaeological_operations/views.py index e5bf16ce8..c2e0b135c 100644 --- a/archaeological_operations/views.py +++ b/archaeological_operations/views.py @@ -48,7 +48,7 @@ def autocomplete_patriarche(request, non_closed=True): if non_closed: query = query & Q(end_date__isnull=True) limit = 15 - operations = models.Operation.objects.filter(query)[:limit] + operations = models.Operation.objects.filter(query).order_by('code_patriarche')[:limit] data = json.dumps([{'id':operation.code_patriarche, 'value':operation.code_patriarche} for operation in operations]) |