fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PM-4330

Browse Source
This commit is contained in:
Roly Rudy Gutierrez Pinto
2015-12-08 11:24:21 -04:00
parent e0fa53dc48
commit 6cb712bfa3
1 changed files with 29 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
workflow/engine/classes/class.pmDynaform.php
View File

@@ -289,10 +289,31 @@ class pmDynaform
} }
if ($key === "type" && ($value === "checkbox")) { if ($key === "type" && ($value === "checkbox")) {
$json->data = new stdClass(); $json->data = new stdClass();
$json->data->value = ""; $json->data->value = "0";
$json->data->label = ""; $json->data->label = "";
foreach ($json->options as $os) {
if ($os->value === false || $os->value === 0 || $os->value === "0") {
$json->data->label = $os->label;
}
}
if ($json->defaultValue !== "") {
$json->data->value = $json->defaultValue;
foreach ($json->options as $os) {
if (($json->data->value === "true" || $json->data->value === "1") &&
($os->value === true || $os->value === 1 || $os->value === "1")) {
$json->data->label = $os->label;
}
if (($json->data->value === "false" || $json->data->value === "0") &&
($os->value === false || $os->value === 0 || $os->value === "0")) {
$json->data->label = $os->label;
}
}
}
if (isset($this->fields["APP_DATA"][$json->name])) { if (isset($this->fields["APP_DATA"][$json->name])) {
$json->data->value = $this->fields["APP_DATA"][$json->name]; $json->data->value = $this->fields["APP_DATA"][$json->name];
if (is_array($json->data->value) && isset($json->data->value[0])) {
$json->data->value = $json->data->value[0];
}
foreach ($json->options as $os) { foreach ($json->options as $os) {
if (($json->data->value === true || $json->data->value === 1 || $json->data->value === "1") && if (($json->data->value === true || $json->data->value === 1 || $json->data->value === "1") &&
($os->value === true || $os->value === 1 || $os->value === "1")) { ($os->value === true || $os->value === 1 || $os->value === "1")) {
@@ -353,21 +374,21 @@ class pmDynaform
$licensedFeatures = &PMLicensedFeatures::getSingleton(); $licensedFeatures = &PMLicensedFeatures::getSingleton();
$enablePMGmail = false; $enablePMGmail = false;
if ($licensedFeatures->verifyfeature('7qhYmF1eDJWcEdwcUZpT0k4S0xTRStvdz09')) { if ($licensedFeatures->verifyfeature('7qhYmF1eDJWcEdwcUZpT0k4S0xTRStvdz09')) {
G::LoadClass( "pmDrive" ); G::LoadClass("pmDrive");
$pmDrive = new PMDrive(); $pmDrive = new PMDrive();
$enablePMGmail = $pmDrive->getStatusService(); $enablePMGmail = $pmDrive->getStatusService();
} }
/*----------------------------------********---------------------------------*/ /*----------------------------------********---------------------------------*/
$oCriteria = new Criteria("workflow"); $oCriteria = new Criteria("workflow");
$oCriteria->addSelectColumn(AppDocumentPeer::APP_DOC_UID); $oCriteria->addSelectColumn(AppDocumentPeer::APP_DOC_UID);
$oCriteria->addSelectColumn(AppDocumentPeer::DOC_VERSION); $oCriteria->addSelectColumn(AppDocumentPeer::DOC_VERSION);
$oCriteria->addSelectColumn(ContentPeer::CON_VALUE); $oCriteria->addSelectColumn(ContentPeer::CON_VALUE);
/*----------------------------------********---------------------------------*/ /*----------------------------------********---------------------------------*/
if ($enablePMGmail) { if ($enablePMGmail) {
$oCriteria->addSelectColumn(AppDocumentPeer::APP_DOC_DRIVE_DOWNLOAD); $oCriteria->addSelectColumn(AppDocumentPeer::APP_DOC_DRIVE_DOWNLOAD);
} }
/*----------------------------------********---------------------------------*/ /*----------------------------------********---------------------------------*/
$oCriteria->addJoin(AppDocumentPeer::APP_DOC_UID, ContentPeer::CON_ID, Criteria::LEFT_JOIN); $oCriteria->addJoin(AppDocumentPeer::APP_DOC_UID, ContentPeer::CON_ID, Criteria::LEFT_JOIN);
$oCriteria->add(AppDocumentPeer::APP_UID, $this->fields["APP_DATA"]["APPLICATION"]); $oCriteria->add(AppDocumentPeer::APP_UID, $this->fields["APP_DATA"]["APPLICATION"]);
$oCriteria->add(AppDocumentPeer::APP_DOC_FIELDNAME, $json->name); $oCriteria->add(AppDocumentPeer::APP_DOC_FIELDNAME, $json->name);
$oCriteria->add(ContentPeer::CON_CATEGORY, 'APP_DOC_FILENAME'); $oCriteria->add(ContentPeer::CON_CATEGORY, 'APP_DOC_FILENAME');
@@ -381,8 +402,7 @@ class pmDynaform
/*----------------------------------********---------------------------------*/ /*----------------------------------********---------------------------------*/
//change donwload link - drive //change donwload link - drive
$driveDownload = @unserialize($row['APP_DOC_DRIVE_DOWNLOAD']); $driveDownload = @unserialize($row['APP_DOC_DRIVE_DOWNLOAD']);
if ($driveDownload !== false && is_array($driveDownload) && array_key_exists('ATTACHED', if ($driveDownload !== false && is_array($driveDownload) && array_key_exists('ATTACHED', $driveDownload) && $enablePMGmail
$driveDownload) && $enablePMGmail
) { ) {
$linkDownload = $driveDownload['ATTACHED']; $linkDownload = $driveDownload['ATTACHED'];
} }
@@ -391,9 +411,9 @@ class pmDynaform
array_push($labelsFromDb, $row["CON_VALUE"]); array_push($labelsFromDb, $row["CON_VALUE"]);
} }
$json->data = new stdClass(); $json->data = new stdClass();
$json->data->value = $links; $json->data->value = $links;
if(sizeof($labelsFromDb)) { if (sizeof($labelsFromDb)) {
$json->data->label = G::json_encode($labelsFromDb); $json->data->label = G::json_encode($labelsFromDb);
} else { } else {
$json->data->label = isset($this->fields["APP_DATA"][$json->name . "_label"]) ? $this->fields["APP_DATA"][$json->name . "_label"] : (isset($this->fields["APP_DATA"][$json->name]) ? $this->fields["APP_DATA"][$json->name] : "[]"); $json->data->label = isset($this->fields["APP_DATA"][$json->name . "_label"]) ? $this->fields["APP_DATA"][$json->name . "_label"] : (isset($this->fields["APP_DATA"][$json->name]) ? $this->fields["APP_DATA"][$json->name] : "[]");
@@ -898,7 +918,7 @@ class pmDynaform
$this->record = $record; $this->record = $record;
$json = G::json_decode($this->record["DYN_CONTENT"]); $json = G::json_decode($this->record["DYN_CONTENT"]);
$this->jsonr($json); $this->jsonr($json);
$currentDynaform = (isset($this->fields['CURRENT_DYNAFORM']) && $this->fields['CURRENT_DYNAFORM'] != '')? $this->fields['CURRENT_DYNAFORM'] : ''; $currentDynaform = (isset($this->fields['CURRENT_DYNAFORM']) && $this->fields['CURRENT_DYNAFORM'] != '') ? $this->fields['CURRENT_DYNAFORM'] : '';
$javascrip = "" . $javascrip = "" .
"<script type='text/javascript'>\n" . "<script type='text/javascript'>\n" .
"var jsondata = " . G::json_encode($json) . ";\n" . "var jsondata = " . G::json_encode($json) . ";\n" .