diff options
| -rw-r--r-- | ishtar/furnitures/forms.py | 80 | ||||
| -rw-r--r-- | ishtar/furnitures/models.py | 23 | ||||
| -rw-r--r-- | ishtar/locale/fr/LC_MESSAGES/django.po | 477 | ||||
| -rw-r--r-- | ishtar/templates/base.html | 2 | ||||
| -rw-r--r-- | static/media/style.css | 1 |
5 files changed, 330 insertions, 253 deletions
diff --git a/ishtar/furnitures/forms.py b/ishtar/furnitures/forms.py index 6beec3744..b21f801a6 100644 --- a/ishtar/furnitures/forms.py +++ b/ishtar/furnitures/forms.py @@ -894,18 +894,18 @@ class FileFormPreventive(forms.Form): reception_date = forms.DateField(label=_(u"Reception date"), initial=get_now, widget=widgets.JQueryDate) -def is_preventive(form_name, file_type_key='file_type'): +def is_preventive(form_name, model, type_key='file_type', key=''): def func(self, request, storage): if storage.prefix not in request.session or \ 'step_data' not in request.session[storage.prefix] or \ form_name not in request.session[storage.prefix]['step_data'] or\ - form_name + '-' + file_type_key not in \ + form_name + '-' + type_key not in \ request.session[storage.prefix]['step_data'][form_name]: return False try: - file_type = int(request.session[storage.prefix]['step_data']\ - [form_name][form_name+'-'+file_type_key]) - return models.FileType.is_preventive(file_type) + type = int(request.session[storage.prefix]['step_data']\ + [form_name][form_name+'-'+type_key]) + return model.is_preventive(type, key) except ValueError: return False return func @@ -918,7 +918,7 @@ file_creation_wizard = FileWizard([ ('preventive-file_creation', FileFormPreventive), ('final-file_creation', FinalForm)], condition_list={ - 'preventive-file_creation':is_preventive('general-file_creation') +'preventive-file_creation':is_preventive('general-file_creation', models.FileType) }, url_name='file_creation',) @@ -931,7 +931,8 @@ file_modification_wizard = FileWizard([ ('preventive-file_modification', FileFormPreventive), ('final-file_modification', FinalForm)], condition_list={ - 'preventive-file_modification':is_preventive('general-file_modification') +'preventive-file_modification':is_preventive('general-file_modification', + models.FileType) }, url_name='file_modification',) @@ -1255,11 +1256,11 @@ class OperationFormReference(forms.Form): currents = {'associated_file':models.File} hidden_year = forms.IntegerField(widget=forms.HiddenInput) hidden_ope = forms.BooleanField(widget=forms.HiddenInput, required=False) - operation_code = forms.IntegerField(label=u"Operation code") + operation_code = forms.IntegerField(label=_(u"Operation code")) if settings.COUNTRY == 'fr': code_patriarche = forms.IntegerField(label=u"Code PATRIARCHE", required=False) - code_dracar = forms.CharField(label=_(u"Code DRACAR"), required=False, + code_dracar = forms.CharField(label=u"Code DRACAR", required=False, validators=[validators.MaxLengthValidator(10)]) def clean(self): cleaned_data = self.cleaned_data @@ -1277,6 +1278,23 @@ class OperationFormReference(forms.Form): 'last_val':max_val}) return cleaned_data +class OperationFormPreventive(forms.Form): + form_label = _("Preventive informations - excavation") + cost = forms.IntegerField(label=_(u"Cost"), required=False) + if settings.COUNTRY == 'fr': + fnap_financing = forms.FloatField(required=False, + label=u"Pourcentage de financement FNAP", + validators=[validators.MinValueValidator(0), + validators.MaxValueValidator(100)]) + +class OperationFormPreventiveDiag(forms.Form): + form_label = _("Preventive informations - diagnostic") + if settings.COUNTRY == 'fr': + zoning_prescription = forms.NullBooleanField(required=False) + large_area_prescription = forms.NullBooleanField(required=False) + geoarchaeological_context_prescription = forms.NullBooleanField( + required=False) + class SelectedTownForm(forms.Form): form_label = _("Towns") associated_models = {'town':models.Town} @@ -1362,22 +1380,40 @@ RemainFormSet = formset_factory(RemainForm, can_delete=True, RemainFormSet.form_label = _("Remain types") operation_creation_wizard = OperationWizard([ - ('general-operation_creation', OperationFormGeneral), - ('refs-operation_creation', OperationFormReference), - ('towns-operation_creation', SelectedTownFormSet), - ('parcels-operation_creation', SelectedParcelFormSet), - ('remains-operation_creation', RemainFormSet), - ('final-operation_creation', FinalForm)], + ('general-operation_creation', OperationFormGeneral), + ('refs-operation_creation', OperationFormReference), + ('preventive-operation_creation', OperationFormPreventive), + ('preventivediag-operation_creation', OperationFormPreventiveDiag), + ('towns-operation_creation', SelectedTownFormSet), + ('parcels-operation_creation', SelectedParcelFormSet), + ('remains-operation_creation', RemainFormSet), + ('final-operation_creation', FinalForm)], + condition_list={ +'preventive-operation_creation':is_preventive('general-operation_creation', + models.OperationType, 'operation_type', 'prev_excavation'), +'preventivediag-operation_creation':is_preventive('general-operation_creation', + models.OperationType, 'operation_type', 'arch_diagnostic') + }, url_name='operation_creation',) operation_modification_wizard = OperationWizard([ - ('selec-operation_modification', OperationFormSelection), - ('general-operation_modification', OperationFormGeneral), - ('refs-operation_modification', OperationFormReference), - ('towns-operation_modification', SelectedTownFormSet), - ('parcels-operation_modification', SelectedParcelFormSet), - ('remains-operation_modification', RemainFormSet), - ('final-operation_modification', FinalForm)], + ('selec-operation_modification', OperationFormSelection), + ('general-operation_modification', OperationFormGeneral), + ('refs-operation_modification', OperationFormReference), + ('preventive-operation_modification', OperationFormPreventive), + ('preventivediag-operation_modification', OperationFormPreventiveDiag), + ('towns-operation_modification', SelectedTownFormSet), + ('parcels-operation_modification', SelectedParcelFormSet), + ('remains-operation_modification', RemainFormSet), + ('final-operation_modification', FinalForm)], + condition_list={ +'preventive-operation_modification':is_preventive( + 'general-operation_modification', models.OperationType, + 'operation_type', 'prev_excavation'), +'preventivediag-operation_modification':is_preventive( + 'general-operation_modification', models.OperationType, + 'operation_type', 'arch_diagnostic') + }, url_name='operation_modification',) class OperationDateFormSelection(forms.Form): diff --git a/ishtar/furnitures/models.py b/ishtar/furnitures/models.py index fec52bfe5..0ce4ef057 100644 --- a/ishtar/furnitures/models.py +++ b/ishtar/furnitures/models.py @@ -250,9 +250,10 @@ class FileType(GeneralType): verbose_name_plural = _(u"Archaeological file types") @classmethod - def is_preventive(cls, file_type_id): + def is_preventive(cls, file_type_id, key=''): + key = key or 'preventive' try: - preventive = FileType.objects.get(txt_idx="preventive").pk + preventive = FileType.objects.get(txt_idx=key).pk return file_type_id == preventive except ObjectDoesNotExist: return False @@ -342,6 +343,15 @@ class OperationType(GeneralType): verbose_name = _(u"Operation type") verbose_name_plural = _(u"Operation types") + @classmethod + def is_preventive(cls, ope_type_id, key=''): + key = key or 'prev_excavation' + try: + preventive = OperationType.objects.get(txt_idx=key).pk + return ope_type_id == preventive + except ObjectDoesNotExist: + return False + class RemainType(GeneralType): class Meta: verbose_name = _(u"Remain type") @@ -362,12 +372,21 @@ class Operation(BaseHistorizedItem, OwnPerms): verbose_name=_(u"Operation type")) remains = models.ManyToManyField("RemainType", verbose_name=_(u'Remains')) towns = models.ManyToManyField("Town", verbose_name=_(u"Towns")) + cost = models.IntegerField(_(u"Cost"), blank=True, null=True) if settings.COUNTRY == 'fr': code_patriarche = models.IntegerField(u"Code PATRIARCHE", null=True, blank=True) code_dracar = models.CharField(u"Code DRACAR", max_length=10, null=True, blank=True) + fnap_financing = models.FloatField(u"Financement FNAP", + blank=True, null=True) TABLE_COLS += ["code_patriarche", "code_dracar"] + zoning_prescription = models.NullBooleanField(_(u"Prescription on zoning"), + blank=True, null=True) + large_area_prescription = models.NullBooleanField( + _(u"Prescription on large area"), blank=True, null=True) + geoarchaeological_context_prescription = models.NullBooleanField( + _(u"Prescription on geoarchaeological context"), blank=True, null=True) comment = models.TextField(_(u"Comment"), null=True, blank=True) history = HistoricalRecords() diff --git a/ishtar/locale/fr/LC_MESSAGES/django.po b/ishtar/locale/fr/LC_MESSAGES/django.po index 107dfac9f..f3c961c99 100644 --- a/ishtar/locale/fr/LC_MESSAGES/django.po +++ b/ishtar/locale/fr/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: alpha\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-02-07 04:36+0100\n" +"POT-Creation-Date: 2011-02-10 23:57+0100\n" "PO-Revision-Date: 2010-12-09\n" "Last-Translator: Étienne Loks <etienne.loks at peacefrogs net>\n" "Language-Team: \n" @@ -28,276 +28,276 @@ msgstr "identifiant" msgid "email address" msgstr "courriel" -#: furnitures/context_processors.py:42 furnitures/forms.py:693 -#: furnitures/forms.py:1216 furnitures/models.py:599 furnitures/models.py:621 +#: furnitures/context_processors.py:42 furnitures/forms.py:696 +#: furnitures/forms.py:1236 furnitures/models.py:618 furnitures/models.py:640 msgid "Archaelogical file" msgstr "Dossier archéologique" -#: furnitures/context_processors.py:43 furnitures/forms.py:1182 -#: furnitures/models.py:375 furnitures/models.py:404 furnitures/models.py:600 -#: furnitures/models.py:619 +#: furnitures/context_processors.py:43 furnitures/forms.py:1202 +#: furnitures/models.py:394 furnitures/models.py:423 furnitures/models.py:619 +#: furnitures/models.py:638 msgid "Operation" msgstr "Opération" -#: furnitures/forms.py:52 furnitures/forms.py:594 +#: furnitures/forms.py:52 furnitures/forms.py:597 msgid "Confirm" msgstr "Confirmation" -#: furnitures/forms.py:152 +#: furnitures/forms.py:153 msgid "Yes" msgstr "Oui" -#: furnitures/forms.py:154 +#: furnitures/forms.py:155 msgid "No" msgstr "Non" -#: furnitures/forms.py:421 +#: furnitures/forms.py:424 msgid "Enter a valid name consisting of letters, spaces and hyphens." msgstr "Entrez un nom correct composé de lettres, espaces et tirets." -#: furnitures/forms.py:427 furnitures/forms.py:430 furnitures/models.py:221 -#: furnitures/models.py:240 furnitures/models.py:715 furnitures/models.py:739 -#: furnitures/models.py:754 +#: furnitures/forms.py:430 furnitures/forms.py:433 furnitures/models.py:221 +#: furnitures/models.py:240 furnitures/models.py:734 furnitures/models.py:758 +#: furnitures/models.py:773 msgid "Person" msgstr "Individu" -#: furnitures/forms.py:436 +#: furnitures/forms.py:439 msgid "Identity" msgstr "Identité" -#: furnitures/forms.py:439 furnitures/models.py:208 furnitures/models.py:488 +#: furnitures/forms.py:442 furnitures/models.py:208 furnitures/models.py:507 msgid "Title" msgstr "Titre" -#: furnitures/forms.py:440 furnitures/models.py:209 +#: furnitures/forms.py:443 furnitures/models.py:209 msgid "Surname" msgstr "Prénom" -#: furnitures/forms.py:442 furnitures/models.py:180 furnitures/models.py:210 -#: furnitures/models.py:578 furnitures/models.py:680 +#: furnitures/forms.py:445 furnitures/models.py:180 furnitures/models.py:210 +#: furnitures/models.py:597 furnitures/models.py:699 msgid "Name" msgstr "Nom" -#: furnitures/forms.py:444 furnitures/forms.py:559 furnitures/models.py:211 +#: furnitures/forms.py:447 furnitures/forms.py:562 furnitures/models.py:211 msgid "Email" msgstr "Courriel" -#: furnitures/forms.py:446 furnitures/models.py:199 +#: furnitures/forms.py:449 furnitures/models.py:199 msgid "Person type" msgstr "Type d'individu" -#: furnitures/forms.py:448 +#: furnitures/forms.py:451 msgid "Current organization" msgstr "Organisation actuelle" -#: furnitures/forms.py:452 furnitures/models.py:215 +#: furnitures/forms.py:455 furnitures/models.py:215 msgid "Is an author?" msgstr "Est un auteur ?" -#: furnitures/forms.py:455 furnitures/models.py:217 +#: furnitures/forms.py:458 furnitures/models.py:217 msgid "In charge of a storage?" msgstr "Est responsable d'un dépôt ?" -#: furnitures/forms.py:477 furnitures/forms.py:561 +#: furnitures/forms.py:480 furnitures/forms.py:564 msgid "New password" msgstr "Nouveau mot de passe" -#: furnitures/forms.py:531 +#: furnitures/forms.py:534 #, python-format msgid "[%(app_name)s] Account creation/modification" msgstr "[%(app_name)s] Création - modification du compte" -#: furnitures/forms.py:554 furnitures/forms.py:558 +#: furnitures/forms.py:557 furnitures/forms.py:561 msgid "Account" msgstr "Compte" -#: furnitures/forms.py:565 +#: furnitures/forms.py:568 msgid "New password (confirmation)" msgstr "Nouveau mot de passe (confirmation)" -#: furnitures/forms.py:583 +#: furnitures/forms.py:586 msgid "Your password and confirmation password do not match." msgstr "La vérification du mot de passe a échoué." -#: furnitures/forms.py:588 +#: furnitures/forms.py:591 msgid "You must provide a correct password." msgstr "Vous devez fournir un mot de passe correct." -#: furnitures/forms.py:595 +#: furnitures/forms.py:598 msgid "Send the new password by email?" msgstr "Envoyer le nouveau mot de passe par courriel ?" -#: furnitures/forms.py:682 furnitures/forms.py:771 furnitures/forms.py:799 -#: furnitures/forms.py:1171 furnitures/forms.py:1261 furnitures/models.py:163 -#: furnitures/models.py:407 furnitures/models.py:694 +#: furnitures/forms.py:685 furnitures/forms.py:774 furnitures/forms.py:802 +#: furnitures/forms.py:1191 furnitures/forms.py:1301 furnitures/models.py:163 +#: furnitures/models.py:426 furnitures/models.py:713 msgid "Town" msgstr "Commune" -#: furnitures/forms.py:686 furnitures/forms.py:738 furnitures/models.py:280 +#: furnitures/forms.py:689 furnitures/forms.py:741 furnitures/models.py:281 msgid "File type" msgstr "Type de dossier" -#: furnitures/forms.py:688 furnitures/forms.py:889 +#: furnitures/forms.py:691 furnitures/forms.py:892 #: templates/wizard_file_sheet.html:48 msgid "Saisine type" msgstr "Type de saisine" -#: furnitures/forms.py:690 furnitures/forms.py:728 furnitures/forms.py:748 -#: furnitures/forms.py:805 furnitures/forms.py:1179 furnitures/forms.py:1224 -#: furnitures/models.py:275 furnitures/models.py:357 furnitures/models.py:405 +#: furnitures/forms.py:693 furnitures/forms.py:731 furnitures/forms.py:751 +#: furnitures/forms.py:808 furnitures/forms.py:1199 furnitures/forms.py:1244 +#: furnitures/models.py:276 furnitures/models.py:367 furnitures/models.py:424 #: templates/wizard_file_sheet.html:6 msgid "Year" msgstr "Année" -#: furnitures/forms.py:704 +#: furnitures/forms.py:707 msgid "You should select a file." msgstr "Vous devez sélectionner un dossier archéologique." -#: furnitures/forms.py:719 furnitures/forms.py:1204 +#: furnitures/forms.py:722 furnitures/forms.py:1224 msgid "General" msgstr "Général" -#: furnitures/forms.py:723 furnitures/models.py:282 furnitures/models.py:582 +#: furnitures/forms.py:726 furnitures/models.py:283 furnitures/models.py:601 msgid "Person in charge" msgstr "Responsable" -#: furnitures/forms.py:732 furnitures/forms.py:750 furnitures/models.py:277 +#: furnitures/forms.py:735 furnitures/forms.py:753 furnitures/models.py:278 msgid "Numeric reference" msgstr "Référence numérique" -#: furnitures/forms.py:734 furnitures/forms.py:752 furnitures/models.py:278 +#: furnitures/forms.py:737 furnitures/forms.py:755 furnitures/models.py:279 msgid "Internal reference" msgstr "Référence interne" -#: furnitures/forms.py:736 furnitures/models.py:293 +#: furnitures/forms.py:739 furnitures/models.py:294 #: templates/wizard_file_sheet.html:13 msgid "Creation date" msgstr "Date de création" -#: furnitures/forms.py:740 furnitures/models.py:297 +#: furnitures/forms.py:743 furnitures/models.py:298 #: templates/wizard_file_sheet.html:30 msgid "Related file" msgstr "Dossier en relation avec" -#: furnitures/forms.py:744 furnitures/forms.py:1228 furnitures/models.py:110 -#: furnitures/models.py:312 furnitures/models.py:371 furnitures/models.py:583 -#: furnitures/models.py:658 +#: furnitures/forms.py:747 furnitures/forms.py:1248 furnitures/models.py:110 +#: furnitures/models.py:313 furnitures/models.py:390 furnitures/models.py:602 +#: furnitures/models.py:677 msgid "Comment" msgstr "Commentaire" -#: furnitures/forms.py:756 furnitures/models.py:158 +#: furnitures/forms.py:759 furnitures/models.py:158 msgid "Address" msgstr "Adresse" -#: furnitures/forms.py:758 furnitures/models.py:304 +#: furnitures/forms.py:761 furnitures/models.py:305 msgid "Total surface" msgstr "Surface totale" -#: furnitures/forms.py:761 furnitures/models.py:307 +#: furnitures/forms.py:764 furnitures/models.py:308 msgid "Main address" msgstr "Adresse principale" -#: furnitures/forms.py:762 furnitures/models.py:308 +#: furnitures/forms.py:765 furnitures/models.py:309 msgid "Main address - complement" msgstr "Adresse principale - complément" -#: furnitures/forms.py:764 furnitures/models.py:310 +#: furnitures/forms.py:767 furnitures/models.py:311 msgid "Main address - postal code" msgstr "Adresse principale - code postal" -#: furnitures/forms.py:768 furnitures/forms.py:794 furnitures/forms.py:1259 -#: furnitures/forms.py:1280 furnitures/forms.py:1284 furnitures/models.py:292 -#: furnitures/models.py:364 furnitures/models.py:695 +#: furnitures/forms.py:771 furnitures/forms.py:797 furnitures/forms.py:1299 +#: furnitures/forms.py:1320 furnitures/forms.py:1324 furnitures/models.py:293 +#: furnitures/models.py:374 furnitures/models.py:714 msgid "Towns" msgstr "Communes" -#: furnitures/forms.py:790 +#: furnitures/forms.py:793 msgid "There are identical towns." msgstr "Il y a des communes identiques." -#: furnitures/forms.py:797 furnitures/forms.py:859 furnitures/forms.py:1287 -#: furnitures/forms.py:1308 furnitures/forms.py:1312 furnitures/models.py:413 +#: furnitures/forms.py:800 furnitures/forms.py:862 furnitures/forms.py:1327 +#: furnitures/forms.py:1348 furnitures/forms.py:1352 furnitures/models.py:432 msgid "Parcels" msgstr "Parcelles" -#: furnitures/forms.py:801 furnitures/models.py:408 +#: furnitures/forms.py:804 furnitures/models.py:427 msgid "Section" msgstr "Section" -#: furnitures/forms.py:803 furnitures/models.py:409 +#: furnitures/forms.py:806 furnitures/models.py:428 msgid "Parcel number" msgstr "Numéro de parcelle" -#: furnitures/forms.py:833 +#: furnitures/forms.py:836 msgid "All fields are required" msgstr "Tous les champs sont nécessaires" -#: furnitures/forms.py:854 +#: furnitures/forms.py:857 msgid "There are identical parcels." msgstr "Il y a des parcelles identiques." -#: furnitures/forms.py:862 +#: furnitures/forms.py:865 msgid "Preventive informations" msgstr "Information archéologie préventive" -#: furnitures/forms.py:867 furnitures/models.py:284 +#: furnitures/forms.py:870 furnitures/models.py:285 msgid "General contractor" msgstr "Aménageur" -#: furnitures/forms.py:874 furnitures/models.py:286 +#: furnitures/forms.py:877 furnitures/models.py:287 msgid "Town planning service" msgstr "Service instructeur" -#: furnitures/forms.py:880 furnitures/models.py:262 furnitures/models.py:287 +#: furnitures/forms.py:883 furnitures/models.py:263 furnitures/models.py:288 #: templates/wizard_file_sheet.html:50 msgid "Permit type" msgstr "Type de permis" -#: furnitures/forms.py:882 furnitures/models.py:289 +#: furnitures/forms.py:885 furnitures/models.py:290 #: templates/wizard_file_sheet.html:51 msgid "Permit reference" msgstr "Référence du permis" -#: furnitures/forms.py:885 furnitures/models.py:305 +#: furnitures/forms.py:888 furnitures/models.py:306 msgid "Total developed surface" msgstr "Surface totale aménagée" -#: furnitures/forms.py:891 furnitures/models.py:295 +#: furnitures/forms.py:894 furnitures/models.py:296 #: templates/wizard_file_sheet.html:12 msgid "Reception date" msgstr "Date de réception" -#: furnitures/forms.py:979 templates/wizard_file_sheet.html:81 +#: furnitures/forms.py:983 templates/wizard_file_sheet.html:81 msgid "Associated operations" msgstr "Opérations associées" -#: furnitures/forms.py:998 +#: furnitures/forms.py:1002 msgid "Would you like to delete this archaelogical file ?" msgstr "Voulez vous supprimer ce dossier archéologique ?" -#: furnitures/forms.py:1047 furnitures/forms.py:1402 furnitures/models.py:629 -#: furnitures/models.py:753 +#: furnitures/forms.py:1051 furnitures/forms.py:1460 furnitures/models.py:648 +#: furnitures/models.py:772 msgid "Administrative act" msgstr "Acte administratif" -#: furnitures/forms.py:1048 furnitures/forms.py:1403 furnitures/models.py:605 -#: furnitures/models.py:609 +#: furnitures/forms.py:1052 furnitures/forms.py:1461 furnitures/models.py:624 +#: furnitures/models.py:628 msgid "Act type" msgstr "Type d'acte" -#: furnitures/forms.py:1050 furnitures/models.py:617 +#: furnitures/forms.py:1054 furnitures/models.py:636 msgid "Signatory" msgstr "Signataire" -#: furnitures/forms.py:1054 furnitures/models.py:623 +#: furnitures/forms.py:1058 furnitures/models.py:642 msgid "Object" msgstr "Objet" -#: furnitures/forms.py:1056 furnitures/models.py:622 +#: furnitures/forms.py:1060 furnitures/models.py:641 msgid "Signature date" msgstr "Date de signature" -#: furnitures/forms.py:1165 +#: furnitures/forms.py:1185 msgid "" "Warning: No Archaelogical File is provided. If you have forget it return to " "the first step." @@ -305,38 +305,38 @@ msgstr "" "Attention : Aucun dossier archéologique n'a été précisé. S'il s'agit d'un " "oubli, définissez le à la première étape." -#: furnitures/forms.py:1175 furnitures/forms.py:1220 furnitures/models.py:342 -#: furnitures/models.py:362 +#: furnitures/forms.py:1195 furnitures/forms.py:1240 furnitures/models.py:343 +#: furnitures/models.py:372 msgid "Operation type" msgstr "Type d'opération" -#: furnitures/forms.py:1177 furnitures/models.py:363 +#: furnitures/forms.py:1197 furnitures/models.py:373 msgid "Remains" msgstr "Vestiges" -#: furnitures/forms.py:1193 +#: furnitures/forms.py:1213 msgid "You should select an operation." msgstr "Vous devez sélectionner une opération." -#: furnitures/forms.py:1209 furnitures/models.py:611 +#: furnitures/forms.py:1229 furnitures/models.py:630 msgid "Person in charge of the operation" msgstr "Responsable d'opération" -#: furnitures/forms.py:1222 furnitures/models.py:353 furnitures/models.py:422 -#: furnitures/models.py:446 furnitures/models.py:562 furnitures/models.py:716 -#: furnitures/models.py:755 +#: furnitures/forms.py:1242 furnitures/models.py:363 furnitures/models.py:441 +#: furnitures/models.py:465 furnitures/models.py:581 furnitures/models.py:735 +#: furnitures/models.py:774 msgid "Start date" msgstr "Date de début" -#: furnitures/forms.py:1232 +#: furnitures/forms.py:1252 msgid "References" msgstr "Référence" -#: furnitures/forms.py:1242 -msgid "Code DRACAR" -msgstr "Code DRACAR" +#: furnitures/forms.py:1259 furnitures/models.py:368 +msgid "Operation code" +msgstr "Code de l'opération" -#: furnitures/forms.py:1253 +#: furnitures/forms.py:1276 #, python-format msgid "" "Operation code already exist for year: %(year)d - use a value bigger than " @@ -345,32 +345,44 @@ msgstr "" "Ce code d'opération existe déjà pour l'année %(year)d - utilisez une valeur " "plus grande que %(last_val)d" -#: furnitures/forms.py:1289 furnitures/models.py:412 furnitures/models.py:456 -#: furnitures/models.py:561 +#: furnitures/forms.py:1282 +msgid "Preventive informations - excavation" +msgstr "Information archéologie préventive - fouille" + +#: furnitures/forms.py:1283 furnitures/models.py:375 +msgid "Cost" +msgstr "Coût" + +#: furnitures/forms.py:1291 +msgid "Preventive informations - diagnostic" +msgstr "Information archéologie préventive - diagnostique" + +#: furnitures/forms.py:1329 furnitures/models.py:431 furnitures/models.py:475 +#: furnitures/models.py:580 msgid "Parcel" msgstr "Parcelle" -#: furnitures/forms.py:1315 furnitures/forms.py:1340 furnitures/models.py:348 +#: furnitures/forms.py:1355 furnitures/forms.py:1380 furnitures/models.py:358 msgid "Remain types" msgstr "Types de vestige" -#: furnitures/forms.py:1317 furnitures/models.py:347 +#: furnitures/forms.py:1357 furnitures/models.py:357 msgid "Remain type" msgstr "Type de vestige" -#: furnitures/forms.py:1335 +#: furnitures/forms.py:1375 msgid "There are identical remain types." msgstr "Il y a des types de vestige identiques." -#: furnitures/forms.py:1362 furnitures/forms.py:1363 furnitures/models.py:354 +#: furnitures/forms.py:1420 furnitures/forms.py:1421 furnitures/models.py:364 msgid "Closing date" msgstr "Date de clotûre" -#: furnitures/forms.py:1373 +#: furnitures/forms.py:1431 msgid "Would you like to close this operation?" msgstr "Voulez vous clôturer cette opération ?" -#: furnitures/forms.py:1391 +#: furnitures/forms.py:1449 msgid "Would you like to delete this operation?" msgstr "Voulez vous supprimer cette opération ?" @@ -438,8 +450,8 @@ msgstr "Élément invalide." msgid "This item already exist." msgstr "Cet élément existe déjà." -#: furnitures/models.py:107 furnitures/models.py:146 furnitures/models.py:457 -#: furnitures/models.py:508 furnitures/models.py:532 +#: furnitures/models.py:107 furnitures/models.py:146 furnitures/models.py:476 +#: furnitures/models.py:527 furnitures/models.py:551 msgid "Label" msgstr "Libellé" @@ -495,7 +507,7 @@ msgstr "Type d'organisation" msgid "Organization types" msgstr "Types d'organisation" -#: furnitures/models.py:182 furnitures/models.py:212 furnitures/models.py:489 +#: furnitures/models.py:182 furnitures/models.py:212 furnitures/models.py:508 #: templates/wizard_file_sheet.html:28 msgid "Type" msgstr "Type" @@ -588,468 +600,476 @@ msgstr "Type de dossier archéologique" msgid "Archaeological file types" msgstr "Types de dossier archéologique" -#: furnitures/models.py:263 +#: furnitures/models.py:264 msgid "Permit types" msgstr "Types de permis" -#: furnitures/models.py:267 +#: furnitures/models.py:268 msgid "Delay (in days)" msgstr "Delai (en jours)" -#: furnitures/models.py:291 +#: furnitures/models.py:292 msgid "Is active?" msgstr "Est actif ?" -#: furnitures/models.py:302 +#: furnitures/models.py:303 msgid "Reference number" msgstr "Référence" -#: furnitures/models.py:316 +#: furnitures/models.py:317 msgid "Archaeological file" msgstr "Dossier archéologique" -#: furnitures/models.py:317 +#: furnitures/models.py:318 msgid "Archaeological files" msgstr "Dossiers archéologiques" -#: furnitures/models.py:319 +#: furnitures/models.py:320 msgid "Can view own Archaelogical file" msgstr "Peut voir son propre Dossier archéologique" -#: furnitures/models.py:320 +#: furnitures/models.py:321 msgid "Can add own Archaelogical file" msgstr "Peut ajouter son propre Dossier archéologique" -#: furnitures/models.py:321 +#: furnitures/models.py:322 msgid "Can change own Archaelogical file" msgstr "Peut changer son propre Dossier archéologique" -#: furnitures/models.py:322 +#: furnitures/models.py:323 msgid "Can delete own Archaelogical file" msgstr "Peut supprimer son propre Dossier archéologique" -#: furnitures/models.py:327 furnitures/models.py:385 +#: furnitures/models.py:328 furnitures/models.py:404 msgid "Intercommunal" msgstr "Intercommunal" -#: furnitures/models.py:343 +#: furnitures/models.py:344 msgid "Operation types" msgstr "Types d'opération" -#: furnitures/models.py:356 +#: furnitures/models.py:366 msgid "In charge" msgstr "Responsable" -#: furnitures/models.py:358 -msgid "Operation code" -msgstr "Code de l'opération" - -#: furnitures/models.py:360 furnitures/models.py:402 +#: furnitures/models.py:370 furnitures/models.py:421 msgid "File" msgstr "Dossier" -#: furnitures/models.py:376 +#: furnitures/models.py:384 +msgid "Prescription on zoning" +msgstr "Prescription sur zonage" + +#: furnitures/models.py:387 +msgid "Prescription on large area" +msgstr "Prescription sur une vaste surface" + +#: furnitures/models.py:389 +msgid "Prescription on geoarchaeological context" +msgstr "Prescription sur un contexte géo-archéologique" + +#: furnitures/models.py:395 msgid "Operations" msgstr "Opérations" -#: furnitures/models.py:378 +#: furnitures/models.py:397 msgid "Can view own Operation" msgstr "Peut voir sa propre Opération" -#: furnitures/models.py:379 +#: furnitures/models.py:398 msgid "Can add own Operation" msgstr "Peut ajouter sa propre Opération" -#: furnitures/models.py:380 +#: furnitures/models.py:399 msgid "Can change own Operation" msgstr "Peut changer sa propre Opération" -#: furnitures/models.py:381 +#: furnitures/models.py:400 msgid "Can delete own Operation" msgstr "Peut supprimer sa propre Opération" -#: furnitures/models.py:421 furnitures/models.py:531 +#: furnitures/models.py:440 furnitures/models.py:550 msgid "Order" msgstr "Ordre" -#: furnitures/models.py:423 furnitures/models.py:447 furnitures/models.py:563 -#: furnitures/models.py:717 furnitures/models.py:756 +#: furnitures/models.py:442 furnitures/models.py:466 furnitures/models.py:582 +#: furnitures/models.py:736 furnitures/models.py:775 msgid "End date" msgstr "Date de fin" -#: furnitures/models.py:424 +#: furnitures/models.py:443 msgid "Parent period" msgstr "Période parente" -#: furnitures/models.py:428 +#: furnitures/models.py:447 msgid "Type Period" msgstr "Type de période" -#: furnitures/models.py:429 +#: furnitures/models.py:448 msgid "Types Period" msgstr "Types de période" -#: furnitures/models.py:436 furnitures/models.py:448 +#: furnitures/models.py:455 furnitures/models.py:467 msgid "Dating type" msgstr "Type de datation" -#: furnitures/models.py:437 +#: furnitures/models.py:456 msgid "Dating types" msgstr "Types de datation" -#: furnitures/models.py:441 +#: furnitures/models.py:460 msgid "Dating quality" msgstr "Qualité de datation" -#: furnitures/models.py:442 +#: furnitures/models.py:461 msgid "Dating qualities" msgstr "Qualités de datation" -#: furnitures/models.py:445 +#: furnitures/models.py:464 msgid "Period" msgstr "Période" -#: furnitures/models.py:449 +#: furnitures/models.py:468 msgid "Quality" msgstr "Qualité" -#: furnitures/models.py:452 furnitures/models.py:543 +#: furnitures/models.py:471 furnitures/models.py:562 msgid "Dating" msgstr "Datation" -#: furnitures/models.py:453 +#: furnitures/models.py:472 msgid "Datings" msgstr "Datations" -#: furnitures/models.py:458 furnitures/models.py:509 furnitures/models.py:533 +#: furnitures/models.py:477 furnitures/models.py:528 furnitures/models.py:552 msgid "Description" msgstr "Description" -#: furnitures/models.py:459 furnitures/models.py:642 +#: furnitures/models.py:478 furnitures/models.py:661 msgid "Lenght" msgstr "Longueur" -#: furnitures/models.py:460 furnitures/models.py:643 +#: furnitures/models.py:479 furnitures/models.py:662 msgid "Width" msgstr "Largeur" -#: furnitures/models.py:461 +#: furnitures/models.py:480 msgid "Thickness" msgstr "Épaisseur" -#: furnitures/models.py:462 +#: furnitures/models.py:481 msgid "Depth" msgstr "Profondeur" -#: furnitures/models.py:464 +#: furnitures/models.py:483 msgid "Interpretation" msgstr "Interpretation" -#: furnitures/models.py:465 +#: furnitures/models.py:484 msgid "Filling" msgstr "Remplissage" -#: furnitures/models.py:470 furnitures/models.py:511 +#: furnitures/models.py:489 furnitures/models.py:530 msgid "Registration Unit" msgstr "Unité d'Enregistrement" -#: furnitures/models.py:471 +#: furnitures/models.py:490 msgid "Registration Units" msgstr "Unités d'Enregistrement" -#: furnitures/models.py:473 +#: furnitures/models.py:492 msgid "Can view own Registration Unit" msgstr "Peut voir sa propre Unité d'Enregistrement" -#: furnitures/models.py:474 +#: furnitures/models.py:493 msgid "Can add own Registration Unit" msgstr "Peut ajouter sa propre Unité d'Enregistrement" -#: furnitures/models.py:475 +#: furnitures/models.py:494 msgid "Can change own Registration Unit" msgstr "Peut changer sa propre Unité d'Enregistrement" -#: furnitures/models.py:476 +#: furnitures/models.py:495 msgid "Can delete own Registration Unit" msgstr "Peut supprimer sa propre Unité d'Enregistrement" -#: furnitures/models.py:484 +#: furnitures/models.py:503 msgid "Source type" msgstr "Type de source" -#: furnitures/models.py:485 +#: furnitures/models.py:504 msgid "Source types" msgstr "Types de source" -#: furnitures/models.py:492 furnitures/models.py:740 +#: furnitures/models.py:511 furnitures/models.py:759 msgid "Source" msgstr "Source" -#: furnitures/models.py:493 +#: furnitures/models.py:512 msgid "Sources" msgstr "Sources" -#: furnitures/models.py:499 +#: furnitures/models.py:518 msgid "Recommendation" msgstr "Recommendation" -#: furnitures/models.py:501 +#: furnitures/models.py:520 msgid "Parent material" msgstr "Matériau parent" -#: furnitures/models.py:504 furnitures/models.py:535 +#: furnitures/models.py:523 furnitures/models.py:554 msgid "Material type" msgstr "Type de matériaux" -#: furnitures/models.py:505 +#: furnitures/models.py:524 msgid "Material types" msgstr "Types de matériaux" -#: furnitures/models.py:512 +#: furnitures/models.py:531 msgid "Is isolated?" msgstr "Est isolé ?" -#: furnitures/models.py:517 furnitures/models.py:530 +#: furnitures/models.py:536 furnitures/models.py:549 msgid "Base item" msgstr "Élément de base" -#: furnitures/models.py:518 +#: furnitures/models.py:537 msgid "Base items" msgstr "Éléments de base" -#: furnitures/models.py:520 +#: furnitures/models.py:539 msgid "Can view own Base item" msgstr "Peut voir son propre Élément de base" -#: furnitures/models.py:521 +#: furnitures/models.py:540 msgid "Can add own Base item" msgstr "Peut ajouter son propre Élément de base" -#: furnitures/models.py:522 +#: furnitures/models.py:541 msgid "Can change own Base item" msgstr "Peut changer son propre Élément de base" -#: furnitures/models.py:523 +#: furnitures/models.py:542 msgid "Can delete own Base item" msgstr "Peut supprimer son propre Élément de base" -#: furnitures/models.py:536 furnitures/models.py:645 +#: furnitures/models.py:555 furnitures/models.py:664 msgid "Volume" msgstr "Volume" -#: furnitures/models.py:537 +#: furnitures/models.py:556 msgid "Weight" msgstr "Poids" -#: furnitures/models.py:538 +#: furnitures/models.py:557 msgid "Item number" msgstr "Nombre d'éléments" -#: furnitures/models.py:540 +#: furnitures/models.py:559 msgid "Upstream treatment" msgstr "Traitement amont" -#: furnitures/models.py:542 +#: furnitures/models.py:561 msgid "Downstream treatment" msgstr "Traitement aval" -#: furnitures/models.py:547 furnitures/models.py:751 +#: furnitures/models.py:566 furnitures/models.py:770 msgid "Item" msgstr "Élément" -#: furnitures/models.py:548 +#: furnitures/models.py:567 msgid "Items" msgstr "Éléments" -#: furnitures/models.py:550 +#: furnitures/models.py:569 msgid "Can view own Item" msgstr "Peut voir son propre Élément" -#: furnitures/models.py:551 +#: furnitures/models.py:570 msgid "Can add own Item" msgstr "Peut ajouter son propre Élément" -#: furnitures/models.py:552 +#: furnitures/models.py:571 msgid "Can change own Item" msgstr "Peut changer son propre Élément" -#: furnitures/models.py:553 +#: furnitures/models.py:572 msgid "Can delete own Item" msgstr "Peut supprimer son propre Élément" -#: furnitures/models.py:560 +#: furnitures/models.py:579 msgid "Owner" msgstr "Propriétaire" -#: furnitures/models.py:566 +#: furnitures/models.py:585 msgid "Parcel owner" msgstr "Propriétaire de parcelle" -#: furnitures/models.py:567 +#: furnitures/models.py:586 msgid "Parcel owners" msgstr "Propriétaires de parcelle" -#: furnitures/models.py:574 furnitures/models.py:580 +#: furnitures/models.py:593 furnitures/models.py:599 msgid "Warehouse type" msgstr "Type de dépôt" -#: furnitures/models.py:575 +#: furnitures/models.py:594 msgid "Warehouse types" msgstr "Types de dépôts" -#: furnitures/models.py:586 +#: furnitures/models.py:605 msgid "Warehouse" msgstr "Dépôt" -#: furnitures/models.py:587 +#: furnitures/models.py:606 msgid "Warehouses" msgstr "Dépôts" -#: furnitures/models.py:589 +#: furnitures/models.py:608 msgid "Can view own Warehouse" msgstr "Peut voir son propre Dépôt" -#: furnitures/models.py:590 +#: furnitures/models.py:609 msgid "Can add own Warehouse" msgstr "Peut ajouter son propre Dépôt" -#: furnitures/models.py:591 +#: furnitures/models.py:610 msgid "Can change own Warehouse" msgstr "Peut changer son propre Dépôt" -#: furnitures/models.py:592 +#: furnitures/models.py:611 msgid "Can delete own Warehouse" msgstr "Peut supprimer son propre Dépôt" -#: furnitures/models.py:602 +#: furnitures/models.py:621 msgid "Intended to" msgstr "Destiné à" -#: furnitures/models.py:606 +#: furnitures/models.py:625 msgid "Act types" msgstr "Types d'acte" -#: furnitures/models.py:613 +#: furnitures/models.py:632 msgid "Archaeological preventive operator" msgstr "Opérateur d'archéologie préventive" -#: furnitures/models.py:615 +#: furnitures/models.py:634 msgid "Person in charge of the scientific part" msgstr "Responsable scientifique" -#: furnitures/models.py:630 +#: furnitures/models.py:649 msgid "Administrative acts" msgstr "Actes administratifs" -#: furnitures/models.py:632 +#: furnitures/models.py:651 msgid "Can view own Administrative act" msgstr "Peut voir son propre Acte administratif" -#: furnitures/models.py:633 +#: furnitures/models.py:652 msgid "Can add own Administrative act" msgstr "Peut ajouter son propre Acte administratif" -#: furnitures/models.py:634 +#: furnitures/models.py:653 msgid "Can change own Administrative act" msgstr "Peut changer son propre Acte administratif" -#: furnitures/models.py:635 +#: furnitures/models.py:654 msgid "Can delete own Administrative act" msgstr "Peut supprimer son propre Acte administratif" -#: furnitures/models.py:644 +#: furnitures/models.py:663 msgid "Height" msgstr "Hauteur" -#: furnitures/models.py:646 furnitures/models.py:653 furnitures/models.py:657 +#: furnitures/models.py:665 furnitures/models.py:672 furnitures/models.py:676 msgid "Reference" msgstr "Référence" -#: furnitures/models.py:649 furnitures/models.py:656 +#: furnitures/models.py:668 furnitures/models.py:675 msgid "Container type" msgstr "Type de contenant" -#: furnitures/models.py:650 +#: furnitures/models.py:669 msgid "Container types" msgstr "Types de contenant" -#: furnitures/models.py:654 furnitures/models.py:714 +#: furnitures/models.py:673 furnitures/models.py:733 msgid "Location" msgstr "Lieu" -#: furnitures/models.py:661 furnitures/models.py:711 +#: furnitures/models.py:680 furnitures/models.py:730 msgid "Container" msgstr "Contenant" -#: furnitures/models.py:662 +#: furnitures/models.py:681 msgid "Containers" msgstr "Contenants" -#: furnitures/models.py:681 templates/wizard_file_sheet.html:41 +#: furnitures/models.py:700 templates/wizard_file_sheet.html:41 msgid "Surface" msgstr "Surface" -#: furnitures/models.py:682 +#: furnitures/models.py:701 msgid "Localisation" msgstr "Localisation" -#: furnitures/models.py:705 +#: furnitures/models.py:724 msgid "Virtual" msgstr "Virtuel" -#: furnitures/models.py:707 furnitures/models.py:713 +#: furnitures/models.py:726 furnitures/models.py:732 msgid "Treatment type" msgstr "Type de traitement" -#: furnitures/models.py:708 +#: furnitures/models.py:727 msgid "Treatment types" msgstr "Types de traitements" -#: furnitures/models.py:721 +#: furnitures/models.py:740 msgid "Treatment" msgstr "Traitement" -#: furnitures/models.py:722 +#: furnitures/models.py:741 msgid "Treatments" msgstr "Traitements" -#: furnitures/models.py:724 +#: furnitures/models.py:743 msgid "Can view own Treatment" msgstr "Peut voir son propre Traitement" -#: furnitures/models.py:725 +#: furnitures/models.py:744 msgid "Can add own Treatment" msgstr "Peut ajouter son propre Traitement" -#: furnitures/models.py:726 +#: furnitures/models.py:745 msgid "Can change own Treatment" msgstr "Peut changer son propre Traitement" -#: furnitures/models.py:727 +#: furnitures/models.py:746 msgid "Can delete own Treatment" msgstr "Peut supprimer son propre traitement" -#: furnitures/models.py:735 furnitures/models.py:741 +#: furnitures/models.py:754 furnitures/models.py:760 msgid "Author type" msgstr "Type d'auteur" -#: furnitures/models.py:736 +#: furnitures/models.py:755 msgid "Author types" msgstr "Types d'auteur" -#: furnitures/models.py:744 +#: furnitures/models.py:763 msgid "Author" msgstr "Auteur" -#: furnitures/models.py:745 +#: furnitures/models.py:764 msgid "Authors" msgstr "Auteurs" -#: furnitures/models.py:759 +#: furnitures/models.py:778 msgid "Property" msgstr "Propriété" -#: furnitures/models.py:760 +#: furnitures/models.py:779 msgid "Properties" msgstr "Propriétés" @@ -1069,15 +1089,15 @@ msgstr "Recherche" msgid "Search and select an item" msgstr "Rechercher puis sélectionner un élément" -#: furnitures/widgets.py:166 +#: furnitures/widgets.py:167 msgid "Export as CSV" msgstr "Export en CSV" -#: furnitures/widgets.py:217 +#: furnitures/widgets.py:218 msgid "No results" msgstr "Pas de résultats" -#: furnitures/widgets.py:217 +#: furnitures/widgets.py:218 msgid "Loading..." msgstr "Chargement..." @@ -1282,6 +1302,9 @@ msgstr "" "Vous être maintenant enregistré. Un courriel d'activation de votre compte " "vous a été envoyé." +#~ msgid "Code DRACAR" +#~ msgstr "Code DRACAR" + #~ msgid "Your account on %(app_name)s has been created or modified." #~ msgstr "Votre compte sur %(app_name)s a été créé ou modifié" diff --git a/ishtar/templates/base.html b/ishtar/templates/base.html index 22e6d4239..4d9502d39 100644 --- a/ishtar/templates/base.html +++ b/ishtar/templates/base.html @@ -27,7 +27,7 @@ (<a href="{% url auth_logout %}">{% trans "Log out" %}</a> | <a href="{% url auth_password_change %}">{% trans "Change password" %}</a>) {% else %} - <a href="{% url auth_login %}">{% trans "Log in" %}</a> + <strong><a href="{% url auth_login %}">{% trans "Log in" %}</a></strong> {% endif %} {% endblock %} </div> diff --git a/static/media/style.css b/static/media/style.css index 3d52eb5c9..8b2b9576a 100644 --- a/static/media/style.css +++ b/static/media/style.css @@ -52,7 +52,6 @@ button:hover, input[type=submit]:hover{ div#header{ width:100%; text-align:center; - font-weight:bold; font-size: 0.9em; background-color: #EEE; border-bottom:1px solid #CCC; |