diff --git a/module/javascript/script_module.js b/module/javascript/script_module.js
index c4d5044b82743229050a91aaf92ac7218a9e50a5..6b0e36ef2529307c690013c1a7dcbdb9aa223a03 100755
--- a/module/javascript/script_module.js
+++ b/module/javascript/script_module.js
@@ -491,7 +491,7 @@ vitisApp.on('appMainDrtvLoaded', function () {
}else {
// Initialisation des temps maximum de réponse
var matDmat = (sScopeCanal === "MAIL")?"demat":"mat";
- matDmat = (sScopeReminder === true)?"reminder":matDmat;
+ matDmat = (sScopeReminder === true && sScopeType === "DDC")?"reminder":matDmat;
var oLawRestriction = {
"DT":{
diff --git a/storage/fme_project/DTNET_answerCreator/SFR b/storage/fme_project/DTNET_answerCreator/SFR
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git "a/storage/fme_project/UTIL_billingReport/Mod\303\250le" "b/storage/fme_project/UTIL_billingReport/Mod\303\250le"
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/storage/fme_project/UTIL_rapportDtnet/dtnet b/storage/fme_project/UTIL_rapportDtnet/dtnet
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/storage/vex/veremes_DTNET_usection/sql/table.sql b/storage/vex/veremes_DTNET_usection/sql/table.sql
old mode 100644
new mode 100755
diff --git a/storage/vex/veremes_DTNET_uzonedense/sql/table.sql b/storage/vex/veremes_DTNET_uzonedense/sql/table.sql
old mode 100644
new mode 100755
diff --git a/storage/vex/veremes_DTNET_uzonedocument/sql/table.sql b/storage/vex/veremes_DTNET_uzonedocument/sql/table.sql
old mode 100644
new mode 100755
diff --git a/storage/vex/veremes_DTNET_uzonenotification/sql/table.sql b/storage/vex/veremes_DTNET_uzonenotification/sql/table.sql
old mode 100644
new mode 100755
diff --git a/storage/vex/veremes_DTNET_uzonesurveillance/sql/table.sql b/storage/vex/veremes_DTNET_uzonesurveillance/sql/table.sql
old mode 100644
new mode 100755
diff --git a/storage/vex/veremes_DTNET_zonedense/sql/table.sql b/storage/vex/veremes_DTNET_zonedense/sql/table.sql
old mode 100644
new mode 100755
diff --git a/storage/vex/veremes_DTNET_zonedocument/sql/table.sql b/storage/vex/veremes_DTNET_zonedocument/sql/table.sql
old mode 100644
new mode 100755
diff --git a/storage/vex/veremes_DTNET_zonenotification/sql/table.sql b/storage/vex/veremes_DTNET_zonenotification/sql/table.sql
old mode 100644
new mode 100755
diff --git a/storage/vex/veremes_DTNET_zonesurveillance/sql/table.sql b/storage/vex/veremes_DTNET_zonesurveillance/sql/table.sql
old mode 100644
new mode 100755
diff --git a/web_service/ws/Areas.class.inc b/web_service/ws/Areas.class.inc
old mode 100644
new mode 100755
diff --git a/web_service/ws/Dtnet.class.inc b/web_service/ws/Dtnet.class.inc
old mode 100644
new mode 100755
diff --git a/web_service/ws/Mails.class.inc b/web_service/ws/Mails.class.inc
index 41ca2aebb80e153063e03ab64f5fb9670d2e0549..c33a70905a34cab9752a3a48505b1923bede87d3 100755
--- a/web_service/ws/Mails.class.inc
+++ b/web_service/ws/Mails.class.inc
@@ -9,7 +9,7 @@
* \brief This file contains the Mails php class
*
* This class defines Rest Api to Vitis Mails
- *
+ *
*/
require_once __DIR__ . '/Dtnet.class.inc';
require_once 'Mail.class.inc';
@@ -161,7 +161,7 @@ class Mails extends Dtnet {
*/
function PUT() {
$sStatus = 1;
-
+
$sRequest = "SELECT dtdict_id, pdfrequestfile FROM [SCHEMA_DTNET].dtdict WHERE mail_id=[ID]";
$aParams = array(
"SCHEMA_DTNET" => array("value"=>$this->aProperties['schema_dtnet'], "type"=>'column_name'),
diff --git a/web_service/ws/Networkmanagers.class.inc b/web_service/ws/Networkmanagers.class.inc
index d6ba4bdfad490b9d3affc8e758c084c704965562..871fce22b577c8404924b0fc3f77274fb7831bae 100755
--- a/web_service/ws/Networkmanagers.class.inc
+++ b/web_service/ws/Networkmanagers.class.inc
@@ -164,6 +164,12 @@ class Networkmanagers extends Dtnet {
if($aPath[0] !== ""){
$this->aValues["icon"] = $aPath[0];
+ if(!empty($this->aProperties['pushForProxyDownloads']) && !empty($this->aProperties['mainUrlProxyDownloads'])){
+ if(!is_dir($this->aProperties['pushForProxyDownloads'] . "/dtnet/networkmanager/" . $this->aValues['my_vitis_id'])){
+ mkdir($this->aProperties['pushForProxyDownloads'] . "/dtnet/networkmanager/" . $this->aValues['my_vitis_id']);
+ }
+ copy($this->aProperties["ws_data_dir"] . "/dtnet/networkmanager/" . $this->aValues['my_vitis_id']."/".$this->aValues['icon_name'], $this->aProperties['pushForProxyDownloads'] . "/dtnet/networkmanager/" . $this->aValues['my_vitis_id']."/".$this->aValues['icon_name']);
+ }
}
if($aPath[1] !== ""){
diff --git a/web_service/ws/Unr_dtdicts.class.inc b/web_service/ws/Unr_dtdicts.class.inc
old mode 100644
new mode 100755
index d54979dea1869fad1a1648191f962a38dcfd8731..6fe4011d71d1a269d950a2ce37614a6655bc3927
--- a/web_service/ws/Unr_dtdicts.class.inc
+++ b/web_service/ws/Unr_dtdicts.class.inc
@@ -120,7 +120,7 @@ class Unr_dtdicts extends Dtnet {
* @return Unr_dtdicts
*/
function GET() {
- $this->aValues["attributs"] .= "|networkmanager_id";
+ $this->aValues["attributs"] .= "|networkmanager_id|creationdate|projectbeginningdate|receptiontype";
$aReturn = $this->genericGet($this->aProperties['schema_dtnet'], "v_dtdict_unrestricted", "dtdict_id");
$sMessage = $aReturn['sMessage'];
return $sMessage;
diff --git a/web_service/ws/Unr_mails.class.inc b/web_service/ws/Unr_mails.class.inc
old mode 100644
new mode 100755
diff --git a/web_service/ws/Unr_networkmanagers.class.inc b/web_service/ws/Unr_networkmanagers.class.inc
index 89d7bd2a3c9ad2ece15f832f5423b519ee58e2b7..a25d90bac5dda89c0597f6a54237278c95d2ce9b 100755
--- a/web_service/ws/Unr_networkmanagers.class.inc
+++ b/web_service/ws/Unr_networkmanagers.class.inc
@@ -191,6 +191,12 @@ class Unr_networkmanagers extends Dtnet {
$sPath = $this->pictureResampler($sPath, $this->aValues["icon_width"], $this->aValues["icon_height"]);
$aPath = explode("/", $sPath);
$this->aValues["icon"] = $sDirectoryPath . "/" . $aPath[count($aPath) - 1];
+ if(!empty($this->aProperties['pushForProxyDownloads']) && !empty($this->aProperties['mainUrlProxyDownloads'])){
+ if(!is_dir($this->aProperties['pushForProxyDownloads'] . "/dtnet/networkmanager/" . $this->aValues['networkmanager_id'])){
+ mkdir($this->aProperties['pushForProxyDownloads'] . "/dtnet/networkmanager/" . $this->aValues['networkmanager_id']);
+ }
+ copy($this->aProperties["ws_data_dir"] . "/dtnet/networkmanager/" . $this->aValues['networkmanager_id']."/".$aPath[count($aPath) - 1], $this->aProperties['pushForProxyDownloads'] . "/dtnet/networkmanager/" . $this->aValues['networkmanager_id']."/".$aPath[count($aPath) - 1]);
+ }
}
if(!empty($this->aProperties["colorFill"])){
@@ -362,6 +368,12 @@ class Unr_networkmanagers extends Dtnet {
if($aPath[0] !== ""){
$this->aValues["icon"] = $aPath[0];
+ if(!empty($this->aProperties['pushForProxyDownloads']) && !empty($this->aProperties['mainUrlProxyDownloads'])){
+ if(!is_dir($this->aProperties['pushForProxyDownloads'] . "/dtnet/networkmanager/" . $this->aValues['my_vitis_id'])){
+ mkdir($this->aProperties['pushForProxyDownloads'] . "/dtnet/networkmanager/" . $this->aValues['my_vitis_id']);
+ }
+ copy($this->aProperties["ws_data_dir"] . "/dtnet/networkmanager/" . $this->aValues['my_vitis_id']."/".$this->aValues['icon_name'], $this->aProperties['pushForProxyDownloads'] . "/dtnet/networkmanager/" . $this->aValues['my_vitis_id']."/".$this->aValues['icon_name']);
+ }
}
if($aPath[1] !== ""){