fernando/luos
1
0
Fork 0
Code Releases Activity

Merge remote branch 'upstream/master'

Browse Source
This commit is contained in:
dheeyi
2015-06-23 12:00:12 -04:00
parent 0f263539b6 2713b6f1e7
commit 0cd2fd15e1
24 changed files with 394 additions and 227 deletions
Download Patch File Download Diff File Expand all files Collapse all files

93
gulliver/js/dveditor/core/dveditor.js
View File

@@ -1,4 +1,4 @@
function DVEditor(where,body,oHiddenInput,height,mode) function DVEditor(where,body,oHiddenInput,height,mode,editorId)
{ {
var me=this; var me=this;
var hiddenInput=oHiddenInput; var hiddenInput=oHiddenInput;
@@ -12,28 +12,19 @@ function DVEditor(where,body,oHiddenInput,height,mode)
where.appendChild(iframe); where.appendChild(iframe);
var head=document.childNodes[0].childNodes[0]; var head=document.childNodes[0].childNodes[0];
var header=''; var header='';
if (iframe.contentWindow) if (iframe.contentWindow) {
{ var doc = iframe.contentWindow.document;
var doc=iframe.contentWindow.document; } else {
var doc = iframe.contentDocument;
} }
else var _header = $dce("head");// head.cloneNode(true);
{ for (var i=0;i<head.childNodes.length;i++) {
var doc=iframe.contentDocument; try {
}
var _header=$dce("head");// head.cloneNode(true);
for(var i=0;i<head.childNodes.length;i++) {
try{
if ((head.childNodes[i].tagName==='LINK')&& if ((head.childNodes[i].tagName==='LINK')&&
(head.childNodes[i].type="text/css")) (head.childNodes[i].type="text/css")) {
{
_header.appendChild(head.childNodes[i].cloneNode(true)); _header.appendChild(head.childNodes[i].cloneNode(true));
} }
else } catch (e) {
{
}
}
catch(e)
{
} }
} }
header=_header.innerHTML; header=_header.innerHTML;
@@ -42,57 +33,71 @@ function DVEditor(where,body,oHiddenInput,height,mode)
doc.write('<html><head>'+header+'</head><body style="height:100%;padding:0px;margin:0px;border:none;background-color:ThreeDHighlight;cursor:text;">'+body+'</body></html>'); doc.write('<html><head>'+header+'</head><body style="height:100%;padding:0px;margin:0px;border:none;background-color:ThreeDHighlight;cursor:text;">'+body+'</body></html>');
doc.close(); doc.close();
doc.designMode="on"; doc.designMode="on";
if(mode=="edit"){ if (mode=="edit") {
doc.contentEditable=true; doc.contentEditable=true;
}else{ } else {
doc.contentEditable=false; doc.contentEditable=false;
} }
this.doc=doc; this.doc=doc;
me.insertHTML=function (html)
me.insertHTML = function (html)
{ {
var cmd = 'inserthtml'; var cmd = 'inserthtml';
var bool = false; var bool = false;
var value = html; var value = html;
try try {
{
doc.execCommand(cmd,bool,value); doc.execCommand(cmd,bool,value);
} catch (e) { } catch (e) {
} }
return false; return false;
}; };
me.command=function()
me.command = function()
{ {
var cmd = this.getAttribute('name'); var cmd = this.getAttribute('name');
var bool = false; var bool = false;
var value = this.getAttribute('cmdValue') || null; var value = this.getAttribute('cmdValue') || null;
if (value == 'promptUser') if (value == 'promptUser') {
value = prompt( value = prompt(
(typeof(G_STRINGS[this.getAttribute('promptText')])!=='undefined')? (typeof(G_STRINGS[this.getAttribute('promptText')])!=='undefined')?
G_STRINGS[this.getAttribute('promptText')]: G_STRINGS[this.getAttribute('promptText')]:
this.getAttribute('promptText') this.getAttribute('promptText')
); );
try }
{ try {
if (editorId) {
if (window.ActiveXObject && cmd == 'hilitecolor') {
doc.selection.createRange().pasteHTML('<span style ="background-color:' + value + '">' +doc.selection.createRange().text +'</span>');
} else {
eval("window._editor" +editorId+".doc.execCommand(cmd,bool,value);");
}
} else {
doc.execCommand(cmd,bool,value); doc.execCommand(cmd,bool,value);
}
} catch (e) { } catch (e) {
} }
return false; return false;
} };
me.loadToolBar=function(uri)
me.loadToolBar = function(uri)
{ {
var tb=WebResource(uri); var tb=WebResource(uri);
if(editorId){ // for multi-edhtmleditor
tb.innerHTML = tb.innerHTML.replace(/DVEditorMap/g, "DVEditorMap" + editorId);
}
iframe.parentNode.insertBefore(tb,iframe); iframe.parentNode.insertBefore(tb,iframe);
me.setToolBar(tb); me.setToolBar(tb);
} };
me.setToolBar=function(toolbar)
me.setToolBar = function(toolbar)
{ {
var buttons=toolbar.getElementsByTagName('area'); var buttons=toolbar.getElementsByTagName('area');
for(var b=0;b<buttons.length;b++) for (var b=0;b<buttons.length;b++) {
{
buttons[b].onclick=me.command; buttons[b].onclick=me.command;
} }
} };
me.getHTML=function()
me.getHTML = function()
{ {
var body=''; var body='';
try { try {
@@ -101,8 +106,8 @@ function DVEditor(where,body,oHiddenInput,height,mode)
} catch (e) { } catch (e) {
} }
return body; return body;
} };
me.setHTML=function(html) me.setHTML = function(html)
{ {
try { try {
body=doc.getElementsByTagName('body')[0]; body=doc.getElementsByTagName('body')[0];
@@ -110,8 +115,9 @@ function DVEditor(where,body,oHiddenInput,height,mode)
} catch (e) { } catch (e) {
} }
return body; return body;
} };
me.refreshHidden=function()
me.refreshHidden = function()
{ {
if(hiddenInput) if(hiddenInput)
{ {
@@ -120,10 +126,11 @@ function DVEditor(where,body,oHiddenInput,height,mode)
hiddenInput.value=html; hiddenInput.value=html;
if (raiseOnChange && hiddenInput.onchange) hiddenInput.onchange(); if (raiseOnChange && hiddenInput.onchange) hiddenInput.onchange();
} }
} };
me.syncHidden=function(name)
me.syncHidden = function(name)
{ {
me.refreshHidden(); me.refreshHidden();
setTimeout(name+".syncHidden('"+name+"')",500); setTimeout(name+".syncHidden('"+name+"')",500);
} };
} }

36
gulliver/system/class.xmlform.php
View File

@@ -4028,6 +4028,42 @@ class XmlForm_Field_CheckGroup extends XmlForm_Field
} }
} }
/**
* Renderring the checkgroup inner grid for Staff Eval Plugin
* @see class.form.php#validateArray();
* @author Edauto
* @since 2012-07-20
*/
public function renderGrid($values = NULL, $owner = NULL) {
$this->executeSQL ( $owner );
$disable = ($owner->mode === 'view') ? 'disabled="disabled" ' : ' ';
$r = 1;
$result = array();
foreach ( $values as $v ) { // foreach the grid row with selection
$i=1;
$html = '';
if (! is_array ( $v )) {
$aV = explode ( '|', str_replace(" ","",$v));
} else {
$aV = $v;
}
foreach ( $this->options as $optionName => $option ) { // foreach the options of checkbox group
$bChecked = in_array ( $i , $aV, true ) || in_array($optionName, $aV, true);
$html .= '<input id="form[' . $owner->name . ']['. $r .']['. $this->name .'][' . $optionName . ']" ';
$html .= 'name="form[' . $owner->name . ']['. $r .']['. $this->name .'][]" ';
$html .= 'type="checkbox" value="' . $optionName . '" ' . ($bChecked ? 'checked ' : ' ') ;
$html .= $disable . '><span class="FormCheck">' . $option . '</span></input>';
if(++$i==count($this->options)){
$html .= ' ' . $this->renderHint();
}
$html .= '<br />';
}
$result[] = $html;
$r++;
}
return $result;
}
} }
/* TODO: DEPRECATED */ /* TODO: DEPRECATED */

19
workflow/engine/classes/class.consolidatedCases.php
View File

@@ -18,14 +18,13 @@ class ConsolidatedCases
if (!$status) { if (!$status) {
$oCaseConsolidated = new CaseConsolidatedCore(); $oCaseConsolidated = new CaseConsolidatedCore();
$oCaseConsolidated = CaseConsolidatedCorePeer::retrieveByPK($sTasUid); $oCaseConsolidated = CaseConsolidatedCorePeer::retrieveByPK($sTasUid);
if (!(is_object($oCaseConsolidated)) || get_class($oCaseConsolidated) != 'CaseConsolidated') { if (!(is_object($oCaseConsolidated)) || get_class($oCaseConsolidated) != 'CaseConsolidatedCore') {
$oCaseConsolidated = new CaseConsolidatedCore();
$oCaseConsolidated->setTasUid($sTasUid);
$oCaseConsolidated->delete();
$oCaseConsolidated = new CaseConsolidatedCore(); $oCaseConsolidated = new CaseConsolidatedCore();
$oCaseConsolidated->setTasUid($sTasUid); $oCaseConsolidated->setTasUid($sTasUid);
$oCaseConsolidated->setConStatus('INACTIVE'); $oCaseConsolidated->setConStatus('INACTIVE');
$oCaseConsolidated->save(); $oCaseConsolidated->save();
}else{
$oCaseConsolidated->delete();
} }
return 1; return 1;
} }
@@ -172,11 +171,21 @@ class ConsolidatedCases
$sRepTabUid = $_POST['form']['REP_TAB_UID']; $sRepTabUid = $_POST['form']['REP_TAB_UID'];
$oCaseConsolidated = CaseConsolidatedCorePeer::retrieveByPK($sTasUid); $oCaseConsolidated = CaseConsolidatedCorePeer::retrieveByPK($sTasUid);
if (!(is_object($oCaseConsolidated)) || get_class($oCaseConsolidated) != 'CaseConsolidated') { if (!(is_object($oCaseConsolidated)) || get_class($oCaseConsolidated) != 'CaseConsolidatedCore') {
$oCaseConsolidated = new CaseConsolidatedCore(); $oCaseConsolidated = new CaseConsolidatedCore();
$oCaseConsolidated->setTasUid($sTasUid); $oCaseConsolidated->setTasUid($sTasUid);
} }
$criteria = new Criteria();
$criteria->addSelectColumn(CaseConsolidatedCorePeer::TAS_UID);
$criteria->add(CaseConsolidatedCorePeer::TAS_UID, $sTasUid);
$rsCriteria = CaseConsolidatedCorePeer::doSelectRS($criteria);
if ($rsCriteria->next()) {
$row = $rsCriteria->getRow();
$oCaseConsolidated->delete();
$oCaseConsolidated = CaseConsolidatedCorePeer::retrieveByPK($sTasUid);
}
$oCaseConsolidated->setConStatus('ACTIVE'); $oCaseConsolidated->setConStatus('ACTIVE');
$oCaseConsolidated->setDynUid($sDynUid); $oCaseConsolidated->setDynUid($sDynUid);
$oCaseConsolidated->setRepTabUid($sRepTabUid); $oCaseConsolidated->setRepTabUid($sRepTabUid);

14
workflow/engine/classes/class.derivation.php
View File

@@ -907,6 +907,20 @@ class Derivation
//Create the new case in the sub-process //Create the new case in the sub-process
// set the initial date to null the time its created // set the initial date to null the time its created
$aNewCase = $this->case->startCase( $aSP['TAS_UID'], $aSP['USR_UID'], true, $appFields); $aNewCase = $this->case->startCase( $aSP['TAS_UID'], $aSP['USR_UID'], true, $appFields);
//Create record in table APP_ASSIGN_SELF_SERVICE_VALUE
$taskSub = new Task();
$arrayNextTaskData = $taskSub->load($aSP["TAS_UID"]);
if ($arrayNextTaskData["TAS_ASSIGN_TYPE"] == "SELF_SERVICE" && trim($arrayNextTaskData["TAS_GROUP_VARIABLE"]) != "") {
$nextTaskGroupVariable = trim($arrayNextTaskData["TAS_GROUP_VARIABLE"], " @#");
if (isset($appFields["APP_DATA"][$nextTaskGroupVariable]) && trim($appFields["APP_DATA"][$nextTaskGroupVariable]) != "") {
$appAssignSelfServiceValue = new AppAssignSelfServiceValue();
$appAssignSelfServiceValue->create($aNewCase['APPLICATION'], $aNewCase['INDEX'], array("PRO_UID" => $aNewCase['PROCESS'], "TAS_UID" => $aSP["TAS_UID"], "GRP_UID" => trim($appFields["APP_DATA"][$nextTaskGroupVariable])));
}
}
//Copy case variables to sub-process case //Copy case variables to sub-process case
$aFields = unserialize( $aSP['SP_VARIABLES_OUT'] ); $aFields = unserialize( $aSP['SP_VARIABLES_OUT'] );
$aNewFields = array (); $aNewFields = array ();

2
workflow/engine/classes/class.processMap.php
View File

@@ -1546,7 +1546,7 @@ class processMap
if ($iForm == 8) { if ($iForm == 8) {
$oCaseConsolidated = CaseConsolidatedCorePeer::retrieveByPK($_SESSION["cDhTajE2T2lxSkhqMzZUTXVacWYyNcKwV3A4eWYybDdyb1p3"]["TAS_UID"]); $oCaseConsolidated = CaseConsolidatedCorePeer::retrieveByPK($_SESSION["cDhTajE2T2lxSkhqMzZUTXVacWYyNcKwV3A4eWYybDdyb1p3"]["TAS_UID"]);
if ((is_object($oCaseConsolidated)) && get_class($oCaseConsolidated) == "CaseConsolidated") { if ((is_object($oCaseConsolidated)) && get_class($oCaseConsolidated) == "CaseConsolidatedCore") {
require_once ("classes/model/ReportTable.php"); require_once ("classes/model/ReportTable.php");
$aFields["CON_STATUS"] = $oCaseConsolidated->getConStatus(); $aFields["CON_STATUS"] = $oCaseConsolidated->getConStatus();

2
workflow/engine/classes/model/ListCompleted.php
View File

@@ -104,7 +104,9 @@ class ListCompleted extends BaseListCompleted
BasePeer::doUpdate($criteriaWhere, $criteriaSet, Propel::getConnection("workflow")); BasePeer::doUpdate($criteriaWhere, $criteriaSet, Propel::getConnection("workflow"));
$users = new Users(); $users = new Users();
if($data['USR_UID'] != ''){
$users->refreshTotal($data['USR_UID'], 'add', 'completed'); $users->refreshTotal($data['USR_UID'], 'add', 'completed');
}
if ($data['DEL_PREVIOUS'] != 0) { if ($data['DEL_PREVIOUS'] != 0) {
$criteria = new Criteria(); $criteria = new Criteria();
$criteria->addSelectColumn(TaskPeer::TAS_TYPE); $criteria->addSelectColumn(TaskPeer::TAS_TYPE);

2
workflow/engine/classes/model/ListInbox.php
View File

@@ -306,7 +306,9 @@ class ListInbox extends BaseListInbox
} }
} }
} else { } else {
if($data['USR_UID'] !=''){
$users->refreshTotal($data['USR_UID'], 'add', 'inbox'); $users->refreshTotal($data['USR_UID'], 'add', 'inbox');
}
if ($dataPreviusApplication['APP_STATUS'] == 'DRAFT') { if ($dataPreviusApplication['APP_STATUS'] == 'DRAFT') {
$users->refreshTotal($dataPreviusApplication['CURRENT_USER_UID'], 'remove', 'draft'); $users->refreshTotal($dataPreviusApplication['CURRENT_USER_UID'], 'remove', 'draft');
} else { } else {

2
workflow/engine/classes/model/ListParticipatedLast.php
View File

@@ -36,6 +36,7 @@ class ListParticipatedLast extends BaseListParticipatedLast
$data['APP_STATUS'] = $aRow['APP_STATUS']; $data['APP_STATUS'] = $aRow['APP_STATUS'];
if ($data['USR_UID'] != 'SELF_SERVICES') { if ($data['USR_UID'] != 'SELF_SERVICES') {
if($data['USR_UID'] != ''){
$criteria = new Criteria(); $criteria = new Criteria();
$criteria->addSelectColumn(UsersPeer::USR_USERNAME); $criteria->addSelectColumn(UsersPeer::USR_USERNAME);
$criteria->addSelectColumn(UsersPeer::USR_FIRSTNAME); $criteria->addSelectColumn(UsersPeer::USR_FIRSTNAME);
@@ -52,6 +53,7 @@ class ListParticipatedLast extends BaseListParticipatedLast
$users = new Users(); $users = new Users();
$users->refreshTotal($data['USR_UID'], 'add', 'participated'); $users->refreshTotal($data['USR_UID'], 'add', 'participated');
} }
}
$con = Propel::getConnection( ListParticipatedLastPeer::DATABASE_NAME ); $con = Propel::getConnection( ListParticipatedLastPeer::DATABASE_NAME );
try { try {

18
workflow/engine/classes/model/OutputDocument.php
View File

@@ -556,6 +556,24 @@ class OutputDocument extends BaseOutputDocument
if (($sUID != '') && is_array($aFields) && ($sPath != '')) { if (($sUID != '') && is_array($aFields) && ($sPath != '')) {
$sContent = G::replaceDataGridField($sContent, $aFields); $sContent = G::replaceDataGridField($sContent, $aFields);
if (strpos($sContent, '<!---{') !== false) {
$template = new Smarty();
$template->compile_dir = PATH_SMARTY_C;
$template->cache_dir = PATH_SMARTY_CACHE;
$template->config_dir = PATH_THIRDPARTY . 'smarty/configs';
$template->caching = false;
$template->left_delimiter = '<!---{';
$template->right_delimiter = '}--->';
$oFile = fopen($sPath . $sFilename . '_smarty.html', 'wb');
fwrite($oFile, $sContent);
fclose($oFile);
$template->templateFile = $sPath . $sFilename . '_smarty.html';
//assign the variables and use the template $template
$template->assign($aFields);
$sContent = $template->fetch($template->templateFile);
unlink($template->templateFile);
}
G::verifyPath($sPath, true); G::verifyPath($sPath, true);
//Start - Create .doc //Start - Create .doc

1
workflow/engine/config/schema.xml
View File

@@ -4857,6 +4857,7 @@
<column name="PRO_UID" type="VARCHAR" size="32" required="true" /> <column name="PRO_UID" type="VARCHAR" size="32" required="true" />
<column name="MONTH" type="INTEGER" required="true" default="0" primaryKey="true" /> <column name="MONTH" type="INTEGER" required="true" default="0" primaryKey="true" />
<column name="YEAR" type="INTEGER" required="true" default="0" primaryKey="true" /> <column name="YEAR" type="INTEGER" required="true" default="0" primaryKey="true" />
<column name="TOTAL_QUEUE_TIME_BY_TASK" type="DECIMAL" size="7,2" default="0" />
<column name="TOTAL_TIME_BY_TASK" type="DECIMAL" size="7,2" default="0" /> <column name="TOTAL_TIME_BY_TASK" type="DECIMAL" size="7,2" default="0" />
<column name="TOTAL_CASES_IN" type="DECIMAL" size="7,2" default="0" /> <column name="TOTAL_CASES_IN" type="DECIMAL" size="7,2" default="0" />
<column name="TOTAL_CASES_OUT" type="DECIMAL" size="7,2" default="0" /> <column name="TOTAL_CASES_OUT" type="DECIMAL" size="7,2" default="0" />

1
workflow/engine/data/mysql/schema.sql
View File

@@ -2707,6 +2707,7 @@ CREATE TABLE `USR_REPORTING`
`PRO_UID` VARCHAR(32) NOT NULL, `PRO_UID` VARCHAR(32) NOT NULL,
`MONTH` INTEGER default 0 NOT NULL, `MONTH` INTEGER default 0 NOT NULL,
`YEAR` INTEGER default 0 NOT NULL, `YEAR` INTEGER default 0 NOT NULL,
`TOTAL_QUEUE_TIME_BY_TASK` DECIMAL(7,2) default 0,
`TOTAL_TIME_BY_TASK` DECIMAL(7,2) default 0, `TOTAL_TIME_BY_TASK` DECIMAL(7,2) default 0,
`TOTAL_CASES_IN` DECIMAL(7,2) default 0, `TOTAL_CASES_IN` DECIMAL(7,2) default 0,
`TOTAL_CASES_OUT` DECIMAL(7,2) default 0, `TOTAL_CASES_OUT` DECIMAL(7,2) default 0,

50
workflow/engine/js/strategicDashboard/timeSeriesPresenter.js
View File

@@ -113,6 +113,7 @@ TimeSeriesPresenter.prototype.changePeriodicityToMonth = function (monthList) {
this.endPeriodState.list = monthList; this.endPeriodState.list = monthList;
this.initPeriodState.visible = true; this.initPeriodState.visible = true;
this.endPeriodState.visible = true; this.endPeriodState.visible = true;
this.endPeriodState.selValue = this.periodEquivalentFromDate (this.helper.ReportingPeriodicityEnum.MONTH, new Date());
} }
TimeSeriesPresenter.prototype.changePeriodicityToQuarter = function (quarterList) { TimeSeriesPresenter.prototype.changePeriodicityToQuarter = function (quarterList) {
@@ -120,6 +121,7 @@ TimeSeriesPresenter.prototype.changePeriodicityToQuarter = function (quarterList
this.endPeriodState.list = quarterList; this.endPeriodState.list = quarterList;
this.initPeriodState.visible = true; this.initPeriodState.visible = true;
this.endPeriodState.visible = true; this.endPeriodState.visible = true;
this.endPeriodState.selValue = this.periodEquivalentFromDate (this.helper.ReportingPeriodicityEnum.QUARTER, new Date());
} }
TimeSeriesPresenter.prototype.changePeriodicityToSemester = function (semesterList) { TimeSeriesPresenter.prototype.changePeriodicityToSemester = function (semesterList) {
@@ -127,6 +129,7 @@ TimeSeriesPresenter.prototype.changePeriodicityToSemester = function (semesterLi
this.endPeriodState.list = semesterList; this.endPeriodState.list = semesterList;
this.initPeriodState.visible = true; this.initPeriodState.visible = true;
this.endPeriodState.visible = true; this.endPeriodState.visible = true;
this.endPeriodState.selValue = this.periodEquivalentFromDate (this.helper.ReportingPeriodicityEnum.SEMESTER, new Date());
} }
TimeSeriesPresenter.prototype.changePeriodicityToYear = function (yearList) { TimeSeriesPresenter.prototype.changePeriodicityToYear = function (yearList) {
@@ -134,6 +137,7 @@ TimeSeriesPresenter.prototype.changePeriodicityToYear = function (yearList) {
this.endPeriodState.list = []; this.endPeriodState.list = [];
this.initPeriodState.visible = false; this.initPeriodState.visible = false;
this.endPeriodState.visible = false; this.endPeriodState.visible = false;
this.endPeriodState.selValue = this.periodEquivalentFromDate (this.helper.ReportingPeriodicityEnum.YEAR, new Date());
} }
TimeSeriesPresenter.prototype.historicData = function (indicator, periodicity, initPeriod, TimeSeriesPresenter.prototype.historicData = function (indicator, periodicity, initPeriod,
@@ -145,7 +149,7 @@ TimeSeriesPresenter.prototype.historicData = function (indicator, periodicity, i
this.model.historicData(indicator, periodicity, initDate, endDate).done(function (data) { this.model.historicData(indicator, periodicity, initDate, endDate).done(function (data) {
var graphData = []; var graphData = [];
$.each(data, function(index, originalObject) { $.each(data, function(index, originalObject) {
var newObject = {datalabel: that.periodValue(periodicity, originalObject) + '/' + originalObject['YEAR'], var newObject = {datalabel: that.periodColumnName(periodicity, originalObject) + '/' + originalObject['YEAR'],
value: originalObject.VALUE value: originalObject.VALUE
} }
graphData.push(newObject); graphData.push(newObject);
@@ -157,7 +161,7 @@ TimeSeriesPresenter.prototype.historicData = function (indicator, periodicity, i
} }
TimeSeriesPresenter.prototype.periodValue = function (periodicity, object) { TimeSeriesPresenter.prototype.periodColumnName = function (periodicity, object) {
var retval = ""; var retval = "";
switch (periodicity*1) { switch (periodicity*1) {
case this.helper.ReportingPeriodicityEnum.MONTH: case this.helper.ReportingPeriodicityEnum.MONTH:
@@ -179,6 +183,48 @@ TimeSeriesPresenter.prototype.periodValue = function (periodicity, object) {
return retval; return retval;
} }
TimeSeriesPresenter.prototype.periodEquivalentFromDate = function (periodicity, date) {
var retval = null;
var year = date.getFullYear();
switch (periodicity * 1) {
case this.helper.ReportingPeriodicityEnum.MONTH:
for (var i = 1; i < 12; i++) {
var periodInitDate = this.periodInitDate (periodicity, i, year);
var periodEndDate = this.periodEndDate (periodicity, i, year);
if (periodInitDate <= date && periodEndDate >= date) {
retval = i;
}
}
break;
case this.helper.ReportingPeriodicityEnum.QUARTER:
for (var i = 1; i < 4; i++) {
var periodInitDate = this.periodInitDate (periodicity, i, year);
var periodEndDate = this.periodEndDate (periodicity, i, year);
if (periodInitDate <= date && periodEndDate >= date) {
retval = i;
}
}
break;
case this.helper.ReportingPeriodicityEnum.SEMESTER:
for (var i = 1; i < 2; i++) {
var periodInitDate = this.periodInitDate (periodicity, i, year);
var periodEndDate = this.periodEndDate (periodicity, i, year);
if (periodInitDate <= date && periodEndDate >= date) {
retval = i;
}
}
break;
case this.helper.ReportingPeriodicityEnum.YEAR:
retval = year
break;
}
if (retval == null) {
throw new Error("The periodicity " + periodicity + " is not supported.");
}
return retval;
}
TimeSeriesPresenter.prototype.periodInitDate = function (periodicity, period, year) { TimeSeriesPresenter.prototype.periodInitDate = function (periodicity, period, year) {
var retval = null; var retval = null;
switch (periodicity * 1) { switch (periodicity * 1) {

2
workflow/engine/js/strategicDashboard/viewDashboardView.js
View File

@@ -505,7 +505,7 @@ var loadIndicator = function (indicatorId, initDate, endDate) {
fillSpecialIndicatorFirstView(viewModel); fillSpecialIndicatorFirstView(viewModel);
break; break;
case "1050": case "1050":
fillStatusIndicatorFirstView(viewModel); //fillStatusIndicatorFirstView(viewModel);
break; break;
default: default:
fillGeneralIndicatorFirstView(viewModel); fillGeneralIndicatorFirstView(viewModel);

4
workflow/engine/menus/setup.php
View File

@@ -66,10 +66,6 @@ if ($RBAC->userCanAccess('PM_SETUP') == 1) {
//$G_TMP_MENU->AddIdRawOption('REPORT_TABLES', '../reportTables/main', 'Report Tables', 'icon-tables.png','', 'settings'); //$G_TMP_MENU->AddIdRawOption('REPORT_TABLES', '../reportTables/main', 'Report Tables', 'icon-tables.png','', 'settings');
$G_TMP_MENU->AddIdRawOption('PM_TABLES', '../pmTables', G::LoadTranslation('ID_ADDITIONAL_TABLES'), 'icon-tables.png','', 'settings'); $G_TMP_MENU->AddIdRawOption('PM_TABLES', '../pmTables', G::LoadTranslation('ID_ADDITIONAL_TABLES'), 'icon-tables.png','', 'settings');
if (!$partnerFlag) {
$G_TMP_MENU->AddIdRawOption('WEBSERVICES', 'webServices', G::LoadTranslation('ID_WEB_SERVICES'), 'icon-webservices.png', '', 'settings');
}
$G_TMP_MENU->AddIdRawOption('LOGIN', 'loginSettings', G::LoadTranslation('LOGIN'), "",'', 'settings'); $G_TMP_MENU->AddIdRawOption('LOGIN', 'loginSettings', G::LoadTranslation('LOGIN'), "",'', 'settings');
$G_TMP_MENU->AddIdRawOption('DASHBOARD', '../dashboard/dashletsList', ucfirst(G::LoadTranslation('ID_DASHBOARD')), '', '', 'settings'); $G_TMP_MENU->AddIdRawOption('DASHBOARD', '../dashboard/dashletsList', ucfirst(G::LoadTranslation('ID_DASHBOARD')), '', '', 'settings');
/*----------------------------------********---------------------------------*/ /*----------------------------------********---------------------------------*/

14
workflow/engine/methods/cases/casesConsolidatedListExtJs.php
View File

@@ -3,9 +3,9 @@
$action = (isset($_REQUEST["action"])) ? $_REQUEST["action"] : "consolidated"; $action = (isset($_REQUEST["action"])) ? $_REQUEST["action"] : "consolidated";
$oCriteria = new Criteria("workflow"); $oCriteria = new Criteria("workflow");
$oCriteria->addSelectColumn(CaseConsolidatedPeer::CON_STATUS); $oCriteria->addSelectColumn(CaseConsolidatedCorePeer::CON_STATUS);
$oCriteria->add(CaseConsolidatedPeer::CON_STATUS, "ACTIVE"); $oCriteria->add(CaseConsolidatedCorePeer::CON_STATUS, "ACTIVE");
$activeNumRows = CaseConsolidatedPeer::doCount($oCriteria); $activeNumRows = CaseConsolidatedCorePeer::doCount($oCriteria);
G::LoadClass ("BasePeer"); G::LoadClass ("BasePeer");
G::LoadClass ("configuration"); G::LoadClass ("configuration");
@@ -18,16 +18,16 @@ $usrUid = $_SESSION["USER_LOGGED"];
$oCriteria = new Criteria("workflow"); $oCriteria = new Criteria("workflow");
$oCriteria->addSelectColumn("*"); $oCriteria->addSelectColumn("*");
$oCriteria->addSelectColumn(CaseConsolidatedPeer::TAS_UID); $oCriteria->addSelectColumn(CaseConsolidatedCorePeer::TAS_UID);
$oCriteria->addJoin(CaseConsolidatedPeer::TAS_UID,ContentPeer::CON_ID, Criteria::LEFT_JOIN); $oCriteria->addJoin(CaseConsolidatedCorePeer::TAS_UID,ContentPeer::CON_ID, Criteria::LEFT_JOIN);
$oCriteria->addJoin(CaseConsolidatedPeer::TAS_UID,TaskPeer::TAS_UID, Criteria::LEFT_JOIN); $oCriteria->addJoin(CaseConsolidatedCorePeer::TAS_UID,TaskPeer::TAS_UID, Criteria::LEFT_JOIN);
$oCriteria->addAnd(ContentPeer::CON_CATEGORY, "TAS_TITLE"); $oCriteria->addAnd(ContentPeer::CON_CATEGORY, "TAS_TITLE");
$oCriteria->addAnd(ContentPeer::CON_LANG, "en"); $oCriteria->addAnd(ContentPeer::CON_LANG, "en");
$params = array(); //This will be filled with the parameters $params = array(); //This will be filled with the parameters
$sql = BasePeer::createSelectSql($oCriteria, $params); $sql = BasePeer::createSelectSql($oCriteria, $params);
$oDataset = CaseConsolidatedPeer::doSelectRS($oCriteria); $oDataset = CaseConsolidatedCorePeer::doSelectRS($oCriteria);
$oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
//$oDataset->next(); //$oDataset->next();
while ($oDataset->next()) { while ($oDataset->next()) {

4
workflow/engine/methods/processes/consolidated.php
View File

@@ -590,10 +590,10 @@ class ajax_con extends WebResource
$sRepTabUid = ""; $sRepTabUid = "";
} }
$oCaseConsolidated = CaseConsolidatedPeer::retrieveByPK($sTasUid); $oCaseConsolidated = CaseConsolidatedCorePeer::retrieveByPK($sTasUid);
if (!(is_object($oCaseConsolidated)) || get_class($oCaseConsolidated) != 'CaseConsolidated') { if (!(is_object($oCaseConsolidated)) || get_class($oCaseConsolidated) != 'CaseConsolidated') {
$oCaseConsolidated = new CaseConsolidated(); $oCaseConsolidated = new CaseConsolidatedCore();
$oCaseConsolidated->setTasUid($sTasUid); $oCaseConsolidated->setTasUid($sTasUid);
} }

2
workflow/engine/methods/setup/setupSchemas/triggerFillReportByUser.sql
View File

@@ -12,6 +12,7 @@ INSERT INTO USR_REPORTING (
PRO_UID, PRO_UID,
MONTH, MONTH,
YEAR, YEAR,
TOTAL_QUEUE_TIME_BY_TASK,
TOTAL_TIME_BY_TASK, TOTAL_TIME_BY_TASK,
TOTAL_CASES_IN, TOTAL_CASES_IN,
TOTAL_CASES_OUT, TOTAL_CASES_OUT,
@@ -31,6 +32,7 @@ SELECT
ACV.PRO_UID, ACV.PRO_UID,
DATE_FORMAT(ACV.DEL_INIT_DATE, '%m') AS `MONTH`, DATE_FORMAT(ACV.DEL_INIT_DATE, '%m') AS `MONTH`,
DATE_FORMAT(ACV.DEL_INIT_DATE, '%Y') AS `YEAR`, DATE_FORMAT(ACV.DEL_INIT_DATE, '%Y') AS `YEAR`,
SUM(ACV.DEL_QUEUE_DURATION*24) AS TOTAL_QUEUE_TIME_BY_TASK,
SUM(ACV.DEL_DURATION*24) AS TOT_TIME_BY_TASK, SUM(ACV.DEL_DURATION*24) AS TOT_TIME_BY_TASK,
COUNT(ACV.DEL_INIT_DATE) AS TOT_CASES_IN, COUNT(ACV.DEL_INIT_DATE) AS TOT_CASES_IN,
COUNT(ACV.DEL_FINISH_DATE) AS TOT_CASES_OUT, COUNT(ACV.DEL_FINISH_DATE) AS TOT_CASES_OUT,

20
workflow/engine/src/ProcessMaker/BusinessModel/Consolidated.php
View File

@@ -65,23 +65,37 @@ class Consolidated
* @param string $app_number, Task Uid * @param string $app_number, Task Uid
* @param string $del_index, Task Uid * @param string $del_index, Task Uid
* @param string $usr_uid, Task Uid * @param string $usr_uid, Task Uid
* @param string $fieldName, Field Name
* @param string $fieldValue, Field Value
* @return string * @return string
* *
* @author Brayan Pereyra (Cochalo) <brayan@colosa.com> * @author Brayan Pereyra (Cochalo) <brayan@colosa.com>
* @copyright Colosa - Bolivia * @copyright Colosa - Bolivia
*/ */
public function postDerivate ($app_uid, $app_number, $del_index, $usr_uid) public function postDerivate ($app_uid, $app_number, $del_index, $usr_uid, $fieldName='', $fieldValue='')
{ {
G::LoadClass("library"); G::LoadClass("library");
G::LoadClass("wsBase"); G::LoadClass("wsBase");
G::LoadClass("case"); G::LoadClass("case");
$ws = new \wsBase(); $ws = new \wsBase();
$oCase = new \Cases(); $oCase = new \Cases();
if (!isset($Fields["DEL_INIT_DATE"])) { if (!isset($Fields["DEL_INIT_DATE"])) {
$oCase->setDelInitDate($app_uid, $del_index); $oCase->setDelInitDate($app_uid, $del_index);
$aFields = $oCase->loadCase($app_uid, $del_index); $aFields = $oCase->loadCase($app_uid, $del_index);
//Update data grid
$aData = $aFields['APP_DATA'];
foreach ($aData as $k => $dataField) {
if(is_array($dataField)){
$pos = count($dataField);
if(isset($aData[$k][$pos][$fieldName])){
$aData[$k][$pos][$fieldName] = $fieldValue;
}
}
}
$aFields['APP_DATA'] = $aData;
$oCase->updateCase($app_uid, $aFields);
//End update
} }
$res = $ws->derivateCase($usr_uid, $app_uid, $del_index, true); $res = $ws->derivateCase($usr_uid, $app_uid, $del_index, true);
@@ -242,7 +256,7 @@ class Consolidated
$tableUid = $item["REP_TAB_UID"]; $tableUid = $item["REP_TAB_UID"];
$tableName = $row["REP_TAB_NAME"]; $tableName = $row["REP_TAB_NAME"];
} else { } else {
throw (new Exception("Not found the report table")); throw new \Exception("Not found the report table");
} }
} }

8
workflow/engine/src/ProcessMaker/Services/Api/Consolidated.php
View File

@@ -136,19 +136,21 @@ class Consolidated extends Api
* @param string $app_uid {@min 1} {@max 32} * @param string $app_uid {@min 1} {@max 32}
* @param string $app_number * @param string $app_number
* @param string $del_index * @param string $del_index
* @param string $field_grid
* @param string $field_grid_val
* @return array * @return array
* *
* @author Brayan Pereyra (Cochalo) <brayan@colosa.com> * @author Brayan Pereyra (Cochalo) <brayan@colosa.com>
* @copyright Colosa - Bolivia * @copyright Colosa - Bolivia
* *
* @url POST /derivate/:app_uid/:app_number/:del_index * @url POST /derivate/:app_uid/:app_number/:del_index/:field_grid/:field_grid_val
*/ */
public function doPostDerivate($app_uid, $app_number, $del_index) public function doPostDerivate($app_uid, $app_number, $del_index, $field_grid, $field_grid_val)
{ {
try { try {
$usr_uid = $this->getUserId(); $usr_uid = $this->getUserId();
$consolidated = new \ProcessMaker\BusinessModel\Consolidated(); $consolidated = new \ProcessMaker\BusinessModel\Consolidated();
return $consolidated->postDerivate($app_uid, $app_number, $del_index, $usr_uid); return $consolidated->postDerivate($app_uid, $app_number, $del_index, $usr_uid,$field_grid, $field_grid_val);
} catch (\Exception $e) { } catch (\Exception $e) {
throw (new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage())); throw (new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage()));
} }

9
workflow/engine/templates/cases/casesList.js
View File

@@ -1058,6 +1058,9 @@ Ext.onReady ( function() {
}); });
/*----------------------------------********---------------------------------*/ /*----------------------------------********---------------------------------*/
if (typeof filterStatus == 'undefined') {
filterStatus = [];
}
var comboFilterStatus = new Ext.form.ComboBox({ var comboFilterStatus = new Ext.form.ComboBox({
width : 180, width : 180,
boxMaxWidth : 200, boxMaxWidth : 200,
@@ -1071,6 +1074,7 @@ Ext.onReady ( function() {
mode : 'local', mode : 'local',
autocomplete : true, autocomplete : true,
triggerAction : 'all', triggerAction : 'all',
hidden : filterStatus.length == 0 ? true : false,
store : new Ext.data.ArrayStore({ store : new Ext.data.ArrayStore({
fields : ['UID','NAME'], fields : ['UID','NAME'],
data : filterStatus data : filterStatus
@@ -1705,8 +1709,11 @@ Ext.onReady ( function() {
'-', '-',
btnAll, btnAll,
'->', // begin using the right-justified button container '->', // begin using the right-justified button container
filterStatus.length != 0 ?[
_('ID_OVERDUE'), _('ID_OVERDUE'),
comboFilterStatus, comboFilterStatus
] : [
],
_("ID_CATEGORY"), _("ID_CATEGORY"),
comboCategory, comboCategory,
"-", "-",

18
workflow/engine/templates/cases/casesListConsolidated.js
View File

@@ -1,6 +1,7 @@
var grdNumRows = 0; // var grdNumRows = 0; //
var grdRowLabel = []; // var grdRowLabel = []; //
var fieldGridGral = '';
var fieldGridGralVal = '';
@@ -409,9 +410,16 @@ Ext.onReady(function () {
var selectedRow = Ext.getCmp(gridId).getSelectionModel().getSelections(); var selectedRow = Ext.getCmp(gridId).getSelectionModel().getSelections();
var maxLenght = selectedRow.length; var maxLenght = selectedRow.length;
for (var i in selectedRow) { for (var i in selectedRow) {
rowGrid = selectedRow[i].data
for (fieldGrid in rowGrid){
if(fieldGrid != 'APP_UID' && fieldGrid != 'APP_NUMBER' && fieldGrid != 'APP_TITLE' && fieldGrid != 'DEL_INDEX' ){
fieldGridGral = fieldGrid;
fieldGridGralVal = rowGrid[fieldGrid];
}
}
if (selectedRow[i].data) { if (selectedRow[i].data) {
//alert (derivateRequestAjax(selectedRow[i].data["company"])); //alert (derivateRequestAjax(selectedRow[i].data["company"]));
ajaxDerivationRequest(selectedRow[i].data["APP_UID"], selectedRow[i].data["DEL_INDEX"], maxLenght, selectedRow[i].data["APP_NUMBER"]); ajaxDerivationRequest(selectedRow[i].data["APP_UID"], selectedRow[i].data["DEL_INDEX"], maxLenght, selectedRow[i].data["APP_NUMBER"],fieldGridGral, fieldGridGralVal);
} }
} }
} }
@@ -1298,14 +1306,14 @@ function generateGrid(proUid, tasUid, dynUid)
}); });
} }
function ajaxDerivationRequest(appUid, delIndex, maxLenght, appNumber){ function ajaxDerivationRequest(appUid, delIndex, maxLenght, appNumber,fieldGridGral, fieldGridGralVal){
Ext.Ajax.request({ Ext.Ajax.request({
method: 'POST', method: 'POST',
headers: { headers: {
'Content-Type': 'application/json', 'Content-Type': 'application/json',
'Authorization': 'Bearer ' + credentials.access_token 'Authorization': 'Bearer ' + credentials.access_token
}, },
url: urlProxy + 'derivate/' + appUid + '/' + appNumber + '/' + delIndex, url: urlProxy + 'derivate/' + appUid + '/' + appNumber + '/' + delIndex + '/' + fieldGridGral + '/' + fieldGridGralVal,
success: function(response) { success: function(response) {
var dataResponse; var dataResponse;
var fullResponseText = response.responseText; var fullResponseText = response.responseText;
@@ -1333,7 +1341,7 @@ function ajaxDerivationRequest(appUid, delIndex, maxLenght, appNumber){
window.location.reload(); window.location.reload();
} }
if (fullResponseText.charAt(0) != "<") { if (fullResponseText.charAt(0) != "<" && parent.document.getElementById("batchRoutingCasesNumRec") != null) {
parent.document.getElementById("batchRoutingCasesNumRec").innerHTML = parseInt(dataResponse.casesNumRec); parent.document.getElementById("batchRoutingCasesNumRec").innerHTML = parseInt(dataResponse.casesNumRec);
} }

2
workflow/engine/templates/oauth2/clientSetup.js
View File

@@ -645,7 +645,7 @@ clientSetup.application = {
//style: "margin: 0 auto 0 auto;", //style: "margin: 0 auto 0 auto;",
//width: 550, //width: 550,
//height: 450, //height: 450,
title: "<div><div style=\"float: left;\">" + "ProcessMaker Dev Tools / User Applications" + "</div><div id=\"divAccessTokenSetup\" style=\"float: right;\"></div><div style=\"clear: both; height: 0; line-height:0; font-size: 0;\"></div></div>", title: "<div><div style=\"float: left;\">" + "User Applications" + "</div><div id=\"divAccessTokenSetup\" style=\"float: right;\"></div><div style=\"clear: both; height: 0; line-height:0; font-size: 0;\"></div></div>",
border: false, border: false,
listeners: { listeners: {

10
workflow/engine/templates/strategicDashboard/viewDashboard.html
View File

@@ -79,7 +79,7 @@
data-indicator-type="<%- indicator.type %>" data-indicator-type="<%- indicator.type %>"
data-gs-min-width="3" data-gs-min-height="2" data-gs-max-height="2" data-gs-min-width="3" data-gs-min-height="2" data-gs-max-height="2"
data-toggle="tooltip" data-original-title={translate label="ID_DASH_HELP_INBOX_STATUS"}> data-toggle="tooltip" data-original-title={translate label="ID_DASH_HELP_INBOX_STATUS"}>
<div class="ind-container-selector panel grid-stack-item-content" style="min-width:200px;"> <div class="ind-container-selector panel grid-stack-item-content panel-status" style="min-width:200px;">
<a data-toggle="collapse" href="#efficiencyindex" aria-expanded="false" aria-controls="efficiencyindex"> <a data-toggle="collapse" href="#efficiencyindex" aria-expanded="false" aria-controls="efficiencyindex">
<div class="panel-heading status-indicator-low" <div class="panel-heading status-indicator-low"
style=" width:<%- indicator.percentageOverdueWidth %>%; style=" width:<%- indicator.percentageOverdueWidth %>%;
@@ -373,15 +373,15 @@
<div id="compareIndicators" class="row pull-left"> <div id="compareIndicators" class="row pull-left">
<div class="span4 pull-left"> <div class="span4 pull-left" style="margin:15px; ">
<span id="indicatorLabel"></span> <span id="indicatorLabel"></span>
<select id="indicatorList"></select> <select id="indicatorList"></select>
<span id="periodicityLabel"></span> <span id="periodicityLabel" style="margin-left:15px;"></span>
<select id="periodicityList" style="width:auto;"></select> <select id="periodicityList" style="width:auto;"></select>
<span id="initPeriodLabel"></span> <span id="initPeriodLabel" style="margin-left:15px;"></span>
<select id="initPeriodList"></select> <select id="initPeriodList"></select>
<select id="initYearList"></select> <select id="initYearList"></select>
<span id="endPeriodLabel"></span> <span id="endPeriodLabel" style="margin-left:15px;"></span>
<select id="endPeriodList"></select> <select id="endPeriodList"></select>
<select id="endYearList"></select> <select id="endYearList"></select>
</div> </div>

2
workflow/public_html/css/sb-admin-2.css
View File

@@ -585,7 +585,7 @@ table.dataTable thead .sorting:after {
margin-bottom: 45px; margin-bottom: 45px;
} }
.panel-green:hover, .panel-red:hover, .panel-high:hover, .panel-low:hover{ .panel-green:hover, .panel-red:hover, .panel-high:hover, .panel-low, .panel-status:hover{
box-shadow:0px 3px 2px #dfdfdf; box-shadow:0px 3px 2px #dfdfdf;
} }