diff options
| author | Étienne Loks <etienne.loks@proxience.com> | 2015-06-05 11:29:37 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@proxience.com> | 2015-06-05 11:29:37 +0200 |
| commit | 939baeba6a263e3c11932c3e588521825df1cb13 (patch) | |
| tree | 19c6bb4c5d9866a4c19c64a14121c04dc7924532 | |
| parent | 698ac377fb1935e8c7f7564ad592648951786b8c (diff) | |
| parent | fe9e2221aae67abd1a139640e123931546c37a6a (diff) | |
| download | Ishtar-939baeba6a263e3c11932c3e588521825df1cb13.tar.bz2 Ishtar-939baeba6a263e3c11932c3e588521825df1cb13.zip | |
Merge branch 'stable'
| -rw-r--r-- | archaeological_operations/tests/MCC-docs-example.csv | 3 | ||||
| -rw-r--r-- | archaeological_operations/tests/MCC-operations-example.csv | 2 | ||||
| -rw-r--r-- | archaeological_operations/tests/MCC-parcelles-example.csv | 3 | ||||
| -rw-r--r-- | docs/source/_static/db-archaeological_context_records.png | bin | 0 -> 409355 bytes | |||
| -rw-r--r-- | docs/source/_static/db-archaeological_files.png | bin | 0 -> 426468 bytes | |||
| -rw-r--r-- | docs/source/_static/db-archaeological_finds.png | bin | 0 -> 698882 bytes | |||
| -rw-r--r-- | docs/source/_static/db-archaeological_operations.png | bin | 0 -> 868075 bytes | |||
| -rw-r--r-- | docs/source/_static/db-archaeological_warehouse.png | bin | 0 -> 152727 bytes | |||
| -rw-r--r-- | docs/source/_static/db-ishtar_common.png | bin | 0 -> 524445 bytes |
9 files changed, 8 insertions, 0 deletions
diff --git a/archaeological_operations/tests/MCC-docs-example.csv b/archaeological_operations/tests/MCC-docs-example.csv new file mode 100644 index 000000000..b554cf388 --- /dev/null +++ b/archaeological_operations/tests/MCC-docs-example.csv @@ -0,0 +1,3 @@ +code OA,identifiant documentation,type,nature support,nombre element,auteur,annee,format,description legende,type contenant,numero contenant,commentaire,echelle taille duree poids,type sous contenant,numero sous contenant,informations complementaires +4801,205-666-1,plan,polyester millimétré,1,G. Martin,2002,A2,,,,,1/50,,, +4801,205-666-2,coupe,polyester millimétré,1,G. Martin,2002,A2,,,,,1/50,,, diff --git a/archaeological_operations/tests/MCC-operations-example.csv b/archaeological_operations/tests/MCC-operations-example.csv new file mode 100644 index 000000000..fa701aacb --- /dev/null +++ b/archaeological_operations/tests/MCC-operations-example.csv @@ -0,0 +1,2 @@ +code OA,region,type operation,intitule operation,operateur,responsable operation,date debut terrain,date fin terrain,chronologie generale,identifiant document georeferencement,notice scientifique +4000,Bourgogne,Fouille programmée,Oppidum de Paris,L'opérateur,Jean Sui-Resp'on Sablé,2000/01/22,2002/12/31,Age du Fer & Gallo-Romain,, diff --git a/archaeological_operations/tests/MCC-parcelles-example.csv b/archaeological_operations/tests/MCC-parcelles-example.csv new file mode 100644 index 000000000..18b293ca0 --- /dev/null +++ b/archaeological_operations/tests/MCC-parcelles-example.csv @@ -0,0 +1,3 @@ +code OA,identifiant parcelle,numero parcelle,section cadastre,annee cadastre,nom commune,numero INSEE commune,nom departement,lieu dit adresse +4801,7,,,,Paris,75101,Ile-de-France,1 rue de l'Église +4801,9,,,,Lille,59350,Nord,Patis du tertre diff --git a/docs/source/_static/db-archaeological_context_records.png b/docs/source/_static/db-archaeological_context_records.png Binary files differnew file mode 100644 index 000000000..24ebb76c4 --- /dev/null +++ b/docs/source/_static/db-archaeological_context_records.png diff --git a/docs/source/_static/db-archaeological_files.png b/docs/source/_static/db-archaeological_files.png Binary files differnew file mode 100644 index 000000000..ad88880d1 --- /dev/null +++ b/docs/source/_static/db-archaeological_files.png diff --git a/docs/source/_static/db-archaeological_finds.png b/docs/source/_static/db-archaeological_finds.png Binary files differnew file mode 100644 index 000000000..67ff28719 --- /dev/null +++ b/docs/source/_static/db-archaeological_finds.png diff --git a/docs/source/_static/db-archaeological_operations.png b/docs/source/_static/db-archaeological_operations.png Binary files differnew file mode 100644 index 000000000..8dd70b217 --- /dev/null +++ b/docs/source/_static/db-archaeological_operations.png diff --git a/docs/source/_static/db-archaeological_warehouse.png b/docs/source/_static/db-archaeological_warehouse.png Binary files differnew file mode 100644 index 000000000..38b6a887a --- /dev/null +++ b/docs/source/_static/db-archaeological_warehouse.png diff --git a/docs/source/_static/db-ishtar_common.png b/docs/source/_static/db-ishtar_common.png Binary files differnew file mode 100644 index 000000000..395b5a174 --- /dev/null +++ b/docs/source/_static/db-ishtar_common.png |
