Merge branch 'master' of ssh://rhea.netlor.fr:2222/monarc/MonarcAppFO

Conflicts:
	composer.json

composer.json

@@ -15,7 +15,8 @@
         "robmorgan/phinx": "0.5.*",
         "monarc/core": "dev-master",
         "monarc/frontoffice": "dev-master",
-        "phing/phing": "~2.0"
+        "phing/phing": "~2.0",
+        "phpoffice/phpword": "dev-master"
     },
     "config": {
         "bin-dir": "bin/"
@@ -28,6 +29,10 @@
         {
             "type": "vcs",
             "url": "git+ssh://gogs@rhea.netlor.fr:2222/monarc/zm_client"
+        },
+        {
+            "type": "vcs",
+            "url": "git+ssh://gogs@rhea.netlor.fr:2222/libs/PHPWord"
         }
     ]
 }

config/autoload/config.local.php.dist

@@ -2,9 +2,18 @@
 
 return [
     'languages' => [
-        1 => 'Français',
+        'fr' => [
-        2 => 'English',
+            'index' => 1,
-        3 => 'Deutsch'
+            'label' => 'Français',
+        ],
+        'en' => [
+            'index' => 2,
+            'label' => 'English',
+        ],
+        'de' => [
+            'index' => 3,
+            'label' => 'Deutsch',
+        ],
     ],
     'defaultLanguageIndex' => 2
 ];

config/autoload/local.php.dist

@@ -35,9 +35,18 @@ return array(
 
 
     'languages' => [
-        1 => 'Français',
+        'fr' => [
-        2 => 'English',
+            'index' => 1,
-        3 => 'Deutsch'
+            'label' => 'Français',
+        ],
+        'en' => [
+            'index' => 2,
+            'label' => 'English',
+        ],
+        'de' => [
+            'index' => 3,
+            'label' => 'Deutsch',
+        ],
     ],
 
     'defaultLanguageIndex' => 1,
@@ -63,5 +72,6 @@ return array(
     'monarc' => array(
         'ttl' => 20, // timeout
         'salt' => '', // salt privé pour chiffrement pwd
+        'cliModel' => 'generic', // modèle à afficher pour le client, soit un ID de modèle spéc, soit 'generic' (vide pour tout)
     ),
 );

config/autoload/smtp.local.php.dist

@@ -1,13 +0,0 @@
-<?php
-
-return [
-    'smtp' => [
-        'name'              => 'mailtrap.io',
-        'host'              => 'mailtrap.io',
-        'connection_class'  => 'crammd5',
-        'connection_config' => [
-            'username' => '******',
-            'password' => '******',
-        ],
-    ]
-];

scripts/extract_translations.sh

@@ -2,11 +2,21 @@
 
 if [ -d node_modules/ng_backoffice ]; then
 	pushd node_modules/ng_backoffice
+
+	if [ -f node_modules/.bin/grunt ]; then
 		node_modules/.bin/grunt extract_translations
+	else
+		grunt extract_translations
+	fi
 fi
 
 
 if [ -d node_modules/ng_client ]; then
 	pushd node_modules/ng_client
+
+	if [ -f node_modules/.bin/grunt ]; then
 		node_modules/.bin/grunt extract_translations
+	else
+		grunt extract_translations
+	fi
 fi

scripts/get_deliverable.sh

@@ -0,0 +1,13 @@
+# ./get_deliverable.sh <token> <anr_id> <model_id>
+clear
+echo "======"
+echo http://monarcfo/api/client-anr/$2/deliverable?model=$3
+echo "======"
+
+curl -H "Token: $1" http://monarcfo/api/client-anr/$2/deliverable?model=$3 > /tmp/exported.docx 2>/dev/null
+
+if grep "errors" /tmp/exported.docx; then
+	cat /tmp/exported.docx
+fi
+
+echo ""