Resolving conflicts

workflow/engine/bin/cron_single.php

@@ -352,6 +352,9 @@ Bootstrap::registerClass('wsResponse',          PATH_HOME . "engine/classes/clas
 
 Bootstrap::registerClass("PMLicensedFeatures",  PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "class.licensedFeatures.php");
 Bootstrap::registerClass("AddonsManagerPeer",   PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "AddonsManagerPeer.php");
+/*----------------------------------********---------------------------------*/
+Bootstrap::registerClass('dashboards',   PATH_HOME . "engine/classes/class.dashboards.php");
+/*----------------------------------********---------------------------------*/
 
 $arrayClass = array("EmailServer", "ListInbox", "ListParticipatedHistory");
 
@@ -365,14 +368,33 @@ foreach ($arrayClass as $value) {
 G::LoadClass("serverConfiguration");
 G::LoadClass("dates"); //Load Criteria
 
+/*----------------------------------********---------------------------------*/
+global $dateInit;
+global $dateFinish;
+/*----------------------------------********---------------------------------*/
+
 if (!defined('SYS_SYS')) {
-    $sObject = $argv[1];
+    $sObject    = $argv[1];
-    $sNow    = $argv[2];
+    $sNow       = $argv[2];
     $dateSystem = $argv[3];
-    $sFilter = '';
+    /*----------------------------------********---------------------------------*/
+    $dateInit   = null;
+    $dateFinish = null;
+    /*----------------------------------********---------------------------------*/
+    $sFilter    = '';
 
     for ($i = 4; $i <= count($argv) - 1; $i++) {
-        $sFilter .= ' ' . $argv[$i];
+        /*----------------------------------********---------------------------------*/
+    	if (strpos($argv[$i], "+init-date") !== false) {
+            $dateInit = substr($argv[$i],10);
+        } else if (strpos($argv[$i], "+finish-date") !== false) {
+            $dateFinish = substr($argv[$i], 12);
+        } else {
+        /*----------------------------------********---------------------------------*/
+            $sFilter .= ' ' . $argv[$i];
+        /*----------------------------------********---------------------------------*/
+        }
+        /*----------------------------------********---------------------------------*/
     }
 
     $oDirectory = dir(PATH_DB);
@@ -470,7 +492,7 @@ if (!defined('SYS_SYS')) {
             } catch (Exception $e) {
                 echo $e->getMessage();
 
-                eprintln("Probelm in workspace: " . $sObject . " it was omitted.", "red");
+                eprintln("Problem in workspace: " . $sObject . " it was omitted.", "red");
             }
 
             eprintln();
@@ -502,11 +524,18 @@ function processWorkspace()
         resendEmails();
         unpauseApplications();
         calculateDuration();
+        /*----------------------------------********---------------------------------*/
+        calculateAppDuration();
+        /*----------------------------------********---------------------------------*/
         executeEvents($sLastExecution);
         executeScheduledCases();
         executeUpdateAppTitle();
         executeCaseSelfService();
         executePlugins();
+        /*----------------------------------********---------------------------------*/
+        fillReportByUser();
+        fillReportByProcess();
+        /*----------------------------------********---------------------------------*/
     } catch (Exception $oError) {
         saveLog("main", "error", "Error processing workspace : " . $oError->getMessage() . "\n");
     }
@@ -696,6 +725,31 @@ function calculateDuration()
     }
 }
 
+/*----------------------------------********---------------------------------*/
+function calculateAppDuration()
+{
+	global $sFilter;
+
+	if ($sFilter != '' && strpos($sFilter, 'calculateapp') === false) {
+		return false;
+	}
+
+	setExecutionMessage("Calculating Duration by Application");
+
+	try {
+		$oApplication = new Application();
+		$oApplication->calculateAppDuration(1);
+
+		setExecutionResultMessage('DONE');
+		saveLog('calculateDurationByApp', 'action', 'Calculating Duration by Application');
+	} catch (Exception $oError) {
+		setExecutionResultMessage('WITH ERRORS', 'error');
+		eprintln("  '-".$oError->getMessage(), 'red');
+		saveLog('calculateDurationByApp', 'error', 'Error Calculating Duration: ' . $oError->getMessage());
+	}
+}
+/*----------------------------------********---------------------------------*/
+
 function executeEvents($sLastExecution, $sNow=null)
 {
     global $sFilter;
@@ -1038,3 +1092,66 @@ function setExecutionResultMessage($m, $t='')
     eprintln("[$m]", $c);
 }
 
+/*----------------------------------********---------------------------------*/
+function fillReportByUser ()
+{
+	try {
+		global $sFilter;
+		global $dateInit;
+		global $dateFinish;
+
+		if (strpos($sFilter, 'report_by_user') === false) {
+			return false;
+		}
+		if ($dateInit == null) {
+			eprintln("You must enter the starting date.", "red");
+			eprintln('Example: +init-date"YYYY-MM-DD HH:MM:SS" +finish-date"YYYY-MM-DD HH:MM:SS"', "red");
+			return false;
+		}
+
+		$dateFinish = ($dateFinish != null) ? $dateFinish : date("Y-m-d H:i:s");
+
+		$appcv = new AppCacheView();
+		$appcv->setPathToAppCacheFiles( PATH_METHODS . 'setup' . PATH_SEP . 'setupSchemas' . PATH_SEP );
+		setExecutionMessage("Calculating data to fill the 'User Reporting'...");
+		$appcv->fillReportByUser($dateInit, $dateFinish);
+		setExecutionResultMessage("DONE");
+	} catch (Exception $e) {
+		setExecutionResultMessage("WITH ERRORS", "error");
+		eprintln("  '-" . $e->getMessage(), "red");
+		saveLog("fillReportByUser", "error", "Error in fill report by user: " . $e->getMessage());
+	}
+}
+
+function fillReportByProcess ()
+{
+	try {
+		global $sFilter;
+		global $dateInit;
+		global $dateFinish;
+
+		if (strpos($sFilter, 'report_by_process') === false) {
+			return false;
+		}
+
+		if ($dateInit == null) {
+			eprintln("You must enter the starting date.", "red");
+			eprintln('Example: +init-date"YYYY-MM-DD HH:MM:SS" +finish-date"YYYY-MM-DD HH:MM:SS"', "red");
+			return false;
+		}
+
+		$dateFinish = ($dateFinish != null) ? $dateFinish : date("Y-m-d H:i:s");
+		$appcv = new AppCacheView();
+		$appcv->setPathToAppCacheFiles( PATH_METHODS . 'setup' . PATH_SEP . 'setupSchemas' . PATH_SEP );
+
+		setExecutionMessage("Calculating data to fill the 'Process Reporting'...");
+		$appcv->fillReportByProcess($dateInit, $dateFinish);
+		setExecutionResultMessage("DONE");
+	} catch (Exception $e) {
+		setExecutionResultMessage("WITH ERRORS", "error");
+		eprintln("  '-" . $e->getMessage(), "red");
+		saveLog("fillReportByProcess", "error", "Error in fill report by process: " . $e->getMessage());
+	}
+}
+/*----------------------------------********---------------------------------*/
+

workflow/engine/classes/class.calendar.php

@@ -414,7 +414,7 @@ class calendar extends CalendarDefinition
     			$hoursDuration -= (float)($secondRes/3600);
     			//$dataLog[] = (float)($secondRes/3600);
     		} else {
-          $newDate = date("Y-m-d H:i:s", strtotime("+" . round(((float)($hoursDuration)) * 3600) . " seconds", strtotime($newDate)));
+    			$newDate = date('Y-m-d H:i:s', strtotime('+' . (((float)$hoursDuration)*3600) . ' seconds', strtotime($newDate)));
     			//$dataLog[] = (float)($hoursDuration);
     			$hoursDuration = 0;
     		}
@@ -796,5 +796,253 @@ class calendar extends CalendarDefinition
         return $return;
     }
 
+
+
+
+
+    /**************SLA classes***************/
+    public function dashCalculateDate ($iniDate, $duration, $formatDuration, $calendarData = array())
+    {
+    	if ( G::toUpper($formatDuration) == 'DAYS' ) {
+    		$duration = $duration*$calendarData['HOURS_FOR_DAY'];
+    	}
+    
+    	$hoursDuration = (float)$duration;
+    	$newDate = $iniDate;
+    
+    	while ($hoursDuration > 0) {
+    		$newDate = $this->dashGetIniDate($newDate, $calendarData);
+    
+    		$rangeWorkHour = $this->dashGetRangeWorkHours($newDate, $calendarData['BUSINESS_DAY']);
+    		$onlyDate = (date('Y-m-d',strtotime($newDate))) . ' ' . $rangeWorkHour['END'];
+    
+    		if ( (((float)$hoursDuration) >= ((float)$rangeWorkHour['TOTAL'])) ||
+    				((strtotime($onlyDate) - strtotime($newDate)) < (((float)$hoursDuration)*3600))
+    		) {
+    			$secondRes = (float)(strtotime($onlyDate) - strtotime($newDate));
+    			$newDate = $onlyDate;
+    			$hoursDuration -= (float)($secondRes/3600);
+    		} else {
+    			$newDate = date('Y-m-d H:i:s', strtotime('+' . (((float)$hoursDuration)*3600) . ' seconds', strtotime($newDate)));
+    			$hoursDuration = 0;
+    		}
+    	}
+    	return $newDate;
+    }
+    
+    //Calculate the duration betwen two dates with a calendar
+    public function dashCalculateDurationWithCalendar ($iniDate, $finDate = null, $calendarData = array())
+    {
+    	if ((is_null($finDate)) || ($finDate == '')) {
+    		$finDate = date('Y-m-d H:i:s');
+    	}
+    
+    	$secondDuration = 0.00;
+    
+    	if ( (strtotime($iniDate)) < (strtotime($finDate)) ) {
+    		$timeIniDate = strtotime($iniDate);
+    		$timeFinDate = strtotime($finDate);
+    	} elseif ( (strtotime($finDate)) < (strtotime($iniDate)) ) {
+    		$timeIniDate = strtotime($finDate);
+    		$timeFinDate = strtotime($iniDate);
+    		$auxDate = $iniDate;
+    		$iniDate = $finDate;
+    		$finDate = $auxDate;
+    	} else {
+    		return $secondDuration;
+    	}
+    
+    	$finDate = $this->dashGetIniDate($finDate, $calendarData);
+    	$newDate = $iniDate;
+    	while ($timeIniDate < $timeFinDate) {
+    		$newDate = $this->dashGetIniDate($newDate, $calendarData);
+    
+    		$rangeWorkHour = $this->dashGetRangeWorkHours($newDate, $calendarData['BUSINESS_DAY']);
+    		$onlyDate = (date('Y-m-d',strtotime($newDate))) . ' ' . $rangeWorkHour['END'];
+    
+    		if ( (strtotime($finDate)) < (strtotime($onlyDate)) ) {
+    			$secondRes = ( ((float)strtotime($finDate)) - ((float)strtotime($newDate)) );
+    			$timeIniDate = strtotime($finDate);
+    			$secondDuration += (float)$secondRes;
+    		} else {
+    			$secondRes = ( ((float)strtotime($onlyDate)) - ((float)strtotime($newDate)) );
+    			$newDate = $onlyDate;
+    			$timeIniDate = strtotime($onlyDate);
+    			$secondDuration += (float)$secondRes;
+    		}
+    	}
+    	return $secondDuration;
+    }
+    
+    public function dashGetIniDate ($iniDate, $calendarData = array())
+    {
+    	$flagIniDate = true;
+    
+    	while ($flagIniDate) {
+    		// 1 if it's a work day
+    		$weekDay = date('w',strtotime($iniDate));
+    		if ( !(in_array($weekDay, $calendarData['CALENDAR_WORK_DAYS_A'])) ) {
+    			$iniDate = date('Y-m-d'.' 00:00:00' , strtotime('+1 day', strtotime($iniDate)));
+    			continue;
+    		}
+    
+    		// 2 if it's a holiday
+    		$iniDateHolidayDay = $this->dashIs_holiday($iniDate, $calendarData['HOLIDAY']);
+    		if ($iniDateHolidayDay) {
+    			$iniDate = date('Y-m-d'.' 00:00:00' , strtotime('+1 day', strtotime($iniDate)));
+    			continue;
+    		}
+    
+    		// 3 if it's work time
+    		$workHours = $this->dashNextWorkHours($iniDate, $weekDay, $calendarData['BUSINESS_DAY']);
+    		if ( !($workHours['STATUS']) ) {
+    			$iniDate = date('Y-m-d'.' 00:00:00' , strtotime('+1 day', strtotime($iniDate)));
+    			continue;
+    		} else {
+    			$iniDate = $workHours['DATE'];
+    		}
+    		$flagIniDate = false;
+    	}
+    
+    	return $iniDate;
+    }
+    
+    public function dashNextWorkHours ($date, $weekDay, $workHours = array())
+    {
+    	$auxIniDate = explode(' ', $date);
+    
+    	$timeDate = $auxIniDate['1'];
+    	$timeDate = (float)str_replace(':', '', ((strlen($timeDate) == 8) ? $timeDate : $timeDate.':00') );
+    	$nextWorkHours = array();
+    
+    	$workHoursDay = array();
+    	$tempWorkHoursDay = array();
+    
+    	foreach ($workHours as $value) {
+    		if ($value['CALENDAR_BUSINESS_DAY'] == $weekDay) {
+    			$rangeWorkHour = array();
+    			$timeStart = $value['CALENDAR_BUSINESS_START'];
+    			$timeEnd   = $value['CALENDAR_BUSINESS_END'];
+    			$rangeWorkHour['START'] = ((strlen($timeStart) == 8) ? $timeStart : $timeStart.':00');
+    			$rangeWorkHour['END']   = ((strlen($timeEnd) == 8) ? $timeEnd : $timeEnd.':00');
+    
+    			$workHoursDay[] = $rangeWorkHour;
+    		}
+    
+    		if ($value['CALENDAR_BUSINESS_DAY'] == '7') {
+    			$rangeWorkHour = array();
+    			$timeStart = $value['CALENDAR_BUSINESS_START'];
+    			$timeEnd   = $value['CALENDAR_BUSINESS_END'];
+    			$rangeWorkHour['START'] = ((strlen($timeStart) == 8) ? $timeStart : $timeStart.':00');
+    			$rangeWorkHour['END']   = ((strlen($timeEnd) == 8) ? $timeEnd : $timeEnd.':00');
+    
+    			$tempWorkHoursDay[] = $rangeWorkHour;
+    		}
+    	}
+    
+    	if ( !(count($workHoursDay)) ) {
+    		$workHoursDay = $tempWorkHoursDay;
+    	}
+    
+    	$countHours = count($workHoursDay);
+    	if ($countHours) {
+    		for ($i = 1; $i < $countHours; $i++) {
+    			for ($j = 0; $j < $countHours-$i; $j++) {
+    				$dataft = (float)str_replace(':', '', $workHoursDay[$j]['START']);
+    				$datasc = (float)str_replace(':', '', $workHoursDay[$j+1]['END']);
+    				if ($dataft > $datasc) {
+    					$aux = $workHoursDay[$j+1];
+    					$workHoursDay[$j+1] = $workHoursDay[$j];
+    					$workHoursDay[$j] = $aux;
+    				}
+    			}
+    		}
+    
+    		foreach ($workHoursDay as $value) {
+    			$iniTime = (float)str_replace(':', '', ((strlen($value['START']) == 8) ? $value['START'] : $value['START'].':00'));
+    			$finTime = (float)str_replace(':', '', ((strlen($value['END']) == 8) ? $value['END'] : $value['END'].':00'));
+    
+    			if ( $timeDate <= $iniTime ) {
+    				$nextWorkHours['STATUS'] = true;
+    				$nextWorkHours['DATE']   = $auxIniDate['0'] . ' ' . ((strlen($value['START']) == 8) ? $value['START'] : $value['START'].':00');
+    				return $nextWorkHours;
+    			} elseif ( ($iniTime <= $timeDate)  && ($timeDate < $finTime) ) {
+    				$nextWorkHours['STATUS'] = true;
+    				$nextWorkHours['DATE']   = $date;
+    				return $nextWorkHours;
+    			}
+    		}
+    	}
+    
+    	$nextWorkHours['STATUS'] = false;
+    	return $nextWorkHours;
+    }
+    
+    public function dashIs_holiday ($date, $holidays = array())
+    {
+    	$auxIniDate = explode(' ', $date);
+    	$iniDate = $auxIniDate['0'];
+    	$iniDate = strtotime($iniDate);
+    
+    	foreach ($holidays as $value) {
+    		$holidayStartDate = strtotime(date('Y-m-d',strtotime($value['CALENDAR_HOLIDAY_START'])));
+    		$holidayEndDate   = strtotime(date('Y-m-d',strtotime($value['CALENDAR_HOLIDAY_END'])));
+    
+    		if ( ($holidayStartDate <= $iniDate) && ($iniDate <= $holidayEndDate) ) {
+    			return true;
+    		}
+    	}
+    	return false;
+    }
+    
+    public function dashGetRangeWorkHours ($date, $workHours)
+    {
+    	$auxIniDate = explode(' ', $date);
+    	$timeDate = $auxIniDate['1'];
+    	$timeDate = (float)str_replace(':', '', ((strlen($timeDate) == 8) ? $timeDate : $timeDate.':00') );
+    	$weekDay = date('w',strtotime($date));
+    
+    	$workHoursDay = array();
+    	$tempWorkHoursDay = array();
+    
+    	foreach ($workHours as $value) {
+    		if ($value['CALENDAR_BUSINESS_DAY'] == $weekDay) {
+    			$rangeWorkHour = array();
+    			$timeStart = $value['CALENDAR_BUSINESS_START'];
+    			$timeEnd   = $value['CALENDAR_BUSINESS_END'];
+    			$rangeWorkHour['START'] = ((strlen($timeStart) == 8) ? $timeStart : $timeStart.':00');
+    			$rangeWorkHour['END']   = ((strlen($timeEnd) == 8) ? $timeEnd : $timeEnd.':00');
+    
+    			$workHoursDay[] = $rangeWorkHour;
+    		}
+    
+    		if ($value['CALENDAR_BUSINESS_DAY'] == '7') {
+    			$rangeWorkHour = array();
+    			$timeStart = $value['CALENDAR_BUSINESS_START'];
+    			$timeEnd   = $value['CALENDAR_BUSINESS_END'];
+    			$rangeWorkHour['START'] = ((strlen($timeStart) == 8) ? $timeStart : $timeStart.':00');
+    			$rangeWorkHour['END']   = ((strlen($timeEnd) == 8) ? $timeEnd : $timeEnd.':00');
+    
+    			$tempWorkHoursDay[] = $rangeWorkHour;
+    		}
+    	}
+    
+    	if ( !(count($workHoursDay)) ) {
+    		$workHoursDay = $tempWorkHoursDay;
+    	}
+    
+    	foreach ($workHoursDay as $value) {
+    		$iniTime = (float)str_replace(':', '', $value['START']);
+    		$finTime = (float)str_replace(':', '', $value['END']);
+    
+    		if ( ($iniTime <= $timeDate)  && ($timeDate <= $finTime) ) {
+    			//pr($finTime .' menos '.$iniTime .' = '.($finTime-$iniTime));
+    			$value['TOTAL'] = (($finTime-$iniTime)/10000);
+    			return $value;
+    		}
+    	}
+    	return false;
+    }
+
 }
-?>
+?>

workflow/engine/classes/model/AppCacheView.php

@@ -1792,5 +1792,68 @@ class AppCacheView extends BaseAppCacheView
         $criteria->addSelectColumn(AppCacheViewPeer::APP_OVERDUE_PERCENTAGE);
         return $criteria;
     }
+
+    /*----------------------------------********---------------------------------*/
+    function fillReportByUser ()
+    {
+    	try {
+    		global $sFilter;
+    		global $dateInit;
+    		global $dateFinish;
+    
+    		if (strpos($sFilter, 'report_by_user') === false) {
+    			return false;
+    		}
+    		if ($dateInit == null) {
+    			eprintln("You must enter the starting date.", "red");
+    			eprintln('Example: +init-date"YYYY-MM-DD HH:MM:SS" +finish-date"YYYY-MM-DD HH:MM:SS"', "red");
+    			return false;
+    		}
+    
+    		$dateFinish = ($dateFinish != null) ? $dateFinish : date("Y-m-d H:i:s");
+    
+    		$appcv = new AppCacheView();
+    		$appcv->setPathToAppCacheFiles( PATH_METHODS . 'setup' . PATH_SEP . 'setupSchemas' . PATH_SEP );
+    		setExecutionMessage("Calculating data to fill the 'User Reporting'...");
+    		$appcv->fillReportByUser($dateInit, $dateFinish);
+    		setExecutionResultMessage("DONE");
+    	} catch (Exception $e) {
+    		setExecutionResultMessage("WITH ERRORS", "error");
+    		eprintln("  '-" . $e->getMessage(), "red");
+    		saveLog("fillReportByUser", "error", "Error in fill report by user: " . $e->getMessage());
+    	}
+    }
+    
+    function fillReportByProcess ()
+    {
+    	try {
+    		global $sFilter;
+    		global $dateInit;
+    		global $dateFinish;
+    
+    		if (strpos($sFilter, 'report_by_process') === false) {
+    			return false;
+    		}
+    
+    		if ($dateInit == null) {
+    			eprintln("You must enter the starting date.", "red");
+    			eprintln('Example: +init-date"YYYY-MM-DD HH:MM:SS" +finish-date"YYYY-MM-DD HH:MM:SS"', "red");
+    			return false;
+    		}
+    
+    		$dateFinish = ($dateFinish != null) ? $dateFinish : date("Y-m-d H:i:s");
+    		$appcv = new AppCacheView();
+    		$appcv->setPathToAppCacheFiles( PATH_METHODS . 'setup' . PATH_SEP . 'setupSchemas' . PATH_SEP );
+    
+    		setExecutionMessage("Calculating data to fill the 'Process Reporting'...");
+    		$appcv->fillReportByProcess($dateInit, $dateFinish);
+    		setExecutionResultMessage("DONE");
+    	} catch (Exception $e) {
+    		setExecutionResultMessage("WITH ERRORS", "error");
+    		eprintln("  '-" . $e->getMessage(), "red");
+    		saveLog("fillReportByProcess", "error", "Error in fill report by process: " . $e->getMessage());
+    	}
+    }
+    /*----------------------------------********---------------------------------*/
 }
 

workflow/engine/classes/model/Application.php

@@ -572,5 +572,111 @@ class Application extends BaseApplication
 
         return $this->getAppUid();
     }
+
+    /*----------------------------------********---------------------------------*/
+    public function calculateAppDuration ($cron = 0)
+    {
+    	try {
+    		if ($cron == 1) {
+    			$arrayCron = unserialize( trim( @file_get_contents( PATH_DATA . "cron" ) ) );
+    			$arrayCron["processcTimeStart"] = time();
+    			@file_put_contents( PATH_DATA . "cron", serialize( $arrayCron ) );
+    		}
+
+    		$calendar = new calendar();
+    
+    		$c = new Criteria( 'workflow' );
+    		$c->clearSelectColumns();
+    		$c->addSelectColumn( ApplicationPeer::APP_UID );
+    		$c->addSelectColumn( ApplicationPeer::APP_NUMBER );
+    		$c->addSelectColumn( ApplicationPeer::APP_STATUS );
+    		$c->addSelectColumn( ApplicationPeer::PRO_UID );
+    		$c->addSelectColumn( ApplicationPeer::APP_INIT_USER );
+    		$c->addSelectColumn( ApplicationPeer::APP_CUR_USER );
+    		$c->addSelectColumn( ApplicationPeer::APP_CREATE_DATE );
+    		$c->addSelectColumn( ApplicationPeer::APP_INIT_DATE );
+    		$c->addSelectColumn( ApplicationPeer::APP_FINISH_DATE );
+    		$c->addSelectColumn( ApplicationPeer::APP_UPDATE_DATE );
+    		$c->addSelectColumn( ApplicationPeer::APP_DURATION );
+    		$c->addSelectColumn( ApplicationPeer::APP_DELAY_DURATION );
+    		$c->addSelectColumn( ProcessPeer::PRO_TIME );
+    		$c->addSelectColumn( ProcessPeer::PRO_TIMEUNIT );
+
+    		$c->addJoin( ApplicationPeer::PRO_UID, ProcessPeer::PRO_UID, Criteria::LEFT_JOIN );
+
+    		$rs = ApplicationPeer::doSelectRS( $c );
+    		$rs->setFetchmode( ResultSet::FETCHMODE_ASSOC );
+    		$rs->next();
+    		$row = $rs->getRow();
+    		$i = 0;
+    
+    		$now = strtotime( 'now' );
+    		while (is_array( $row )) {
+    			$appNumber = $row['APP_NUMBER'];
+    			$appStatus = $row['APP_STATUS'];
+    			$appInitUser = $row['APP_INIT_USER'];
+    			$appCurUser = $row['APP_CUR_USER'];
+    			$appCreateDate = $row['APP_CREATE_DATE'];
+    			$appInitDate = $row['APP_INIT_DATE'];
+    			$appFinishDate = $row['APP_FINISH_DATE'];
+    			$appUpdateDate = $row['APP_UPDATE_DATE'];
+    			$appDuration = $row['APP_DURATION'];
+    			$proTime = $row['PRO_TIME'];
+    			$proTimeUnit = $row['PRO_TIMEUNIT'];
+    			$proUid = $row['PRO_UID'];
+
+    			//get the object,
+    			$oApp = ApplicationPeer::retrieveByPk( $row['APP_UID'] );
+    
+    			//getting the calendar
+    			$calendar->getCalendar(null, $proUid);
+    			$calData = $calendar->getCalendarData();
+
+    			/*if(G::toUpper($proTimeUnit) != 'DAYS'){ //if it is not in days must be in mins.
+    				$proTime = $proTime / (24 * 60 * 60); //converting to Days
+    			}*/
+
+    			$proDueDate = $calendar->dashCalculateDate($row['APP_INIT_DATE'], $proTime, $proTimeUnit, $calData); //date when the process has to finish
+
+    			if($appFinishDate == null){//When the process didnt finish yet.
+    				//Duration
+    				$appDuration = $calendar->dashCalculateDurationWithCalendar($appInitDate, date("Y-m-d H:i:s"), $calData );
+    				
+    				
+    				$appDuration = $appDuration / (24 * 60 * 60); //Saving the proDuration in days. The calculateDurationWithCalendar func returns segs.
+    				$oApp->setAppDuration( $appDuration );
+
+    				//Delay Duration
+    				$delayDuration = $calendar->dashCalculateDurationWithCalendar( $proDueDate, date("Y-m-d H:i:s"), $calData );//it returns in mins
+    				$delayDuration = $delayDuration / (24 * 60 * 60); //Days
+     				$oApp->setAppDelayDuration( $delayDuration );
+    			} else {
+    				//Duration
+    				$appDuration = $calendar->dashCalculateDurationWithCalendar($appInitDate, $appFinishDate, $calData );
+    				$appDuration = $appDuration / (24 * 60 * 60); //Saving the proDuration in days. The calculateDurationWithCalendar func returns mins.
+    				$oApp->setAppDuration( $appDuration );
+    				
+    				//Delay Duration
+    				$delayDuration = $calendar->dashCalculateDurationWithCalendar( $proDueDate, $appFinishDate, $calData );
+    				$delayDuration = $delayDuration / (24 * 60 * 60); //Days
+    				$oApp->setAppDelayDuration( $delayDuration );
+    			}
+
+    			//and finally save the record
+    			$RES = $oApp->save();
+    			$rs->next();
+    			$row = $rs->getRow();
+    		}
+    
+    		if ($cron == 1) {
+    			$arrayCron = unserialize( trim( @file_get_contents( PATH_DATA . "cron" ) ) );
+    			$arrayCron["processcTimeStart"] = time();
+    			@file_put_contents( PATH_DATA . "cron", serialize( $arrayCron ) );
+    		}
+    	} catch (Exception $oError) {
+    		error_log( $oError->getMessage() );
+    	}
+    } 
+    /*----------------------------------********---------------------------------*/
 }
 

workflow/engine/classes/model/map/ApplicationMapBuilder.php

@@ -1,104 +1,108 @@
-<?php
+<?php
-
+
-require_once 'propel/map/MapBuilder.php';
+require_once 'propel/map/MapBuilder.php';
-include_once 'creole/CreoleTypes.php';
+include_once 'creole/CreoleTypes.php';
-
+
-
+
-/**
+/**
- * This class adds structure of 'APPLICATION' table to 'workflow' DatabaseMap object.
+ * This class adds structure of 'APPLICATION' table to 'workflow' DatabaseMap object.
- *
+ *
- *
+ *
- *
+ *
- * These statically-built map classes are used by Propel to do runtime db structure discovery.
+ * These statically-built map classes are used by Propel to do runtime db structure discovery.
- * For example, the createSelectSql() method checks the type of a given column used in an
+ * For example, the createSelectSql() method checks the type of a given column used in an
- * ORDER BY clause to know whether it needs to apply SQL to make the ORDER BY case-insensitive
+ * ORDER BY clause to know whether it needs to apply SQL to make the ORDER BY case-insensitive
- * (i.e. if it's a text column type).
+ * (i.e. if it's a text column type).
- *
+ *
- * @package    workflow.classes.model.map
+ * @package    workflow.classes.model.map
- */
+ */
-class ApplicationMapBuilder
+class ApplicationMapBuilder
-{
+{
-
+
-    /**
+    /**
-     * The (dot-path) name of this class
+     * The (dot-path) name of this class
-     */
+     */
-    const CLASS_NAME = 'classes.model.map.ApplicationMapBuilder';
+    const CLASS_NAME = 'classes.model.map.ApplicationMapBuilder';
-
+
-    /**
+    /**
-     * The database map.
+     * The database map.
-     */
+     */
-    private $dbMap;
+    private $dbMap;
-
+
-    /**
+    /**
-     * Tells us if this DatabaseMapBuilder is built so that we
+     * Tells us if this DatabaseMapBuilder is built so that we
-     * don't have to re-build it every time.
+     * don't have to re-build it every time.
-     *
+     *
-     * @return     boolean true if this DatabaseMapBuilder is built, false otherwise.
+     * @return     boolean true if this DatabaseMapBuilder is built, false otherwise.
-     */
+     */
-    public function isBuilt()
+    public function isBuilt()
-    {
+    {
-        return ($this->dbMap !== null);
+        return ($this->dbMap !== null);
-    }
+    }
-
+
-    /**
+    /**
-     * Gets the databasemap this map builder built.
+     * Gets the databasemap this map builder built.
-     *
+     *
-     * @return     the databasemap
+     * @return     the databasemap
-     */
+     */
-    public function getDatabaseMap()
+    public function getDatabaseMap()
-    {
+    {
-        return $this->dbMap;
+        return $this->dbMap;
-    }
+    }
-
+
-    /**
+    /**
-     * The doBuild() method builds the DatabaseMap
+     * The doBuild() method builds the DatabaseMap
-     *
+     *
-     * @return     void
+     * @return     void
-     * @throws     PropelException
+     * @throws     PropelException
-     */
+     */
-    public function doBuild()
+    public function doBuild()
-    {
+    {
-        $this->dbMap = Propel::getDatabaseMap('workflow');
+        $this->dbMap = Propel::getDatabaseMap('workflow');
-
+
-        $tMap = $this->dbMap->addTable('APPLICATION');
+        $tMap = $this->dbMap->addTable('APPLICATION');
-        $tMap->setPhpName('Application');
+        $tMap->setPhpName('Application');
-
+
-        $tMap->setUseIdGenerator(false);
+        $tMap->setUseIdGenerator(false);
-
+
-        $tMap->addPrimaryKey('APP_UID', 'AppUid', 'string', CreoleTypes::VARCHAR, true, 32);
+        $tMap->addPrimaryKey('APP_UID', 'AppUid', 'string', CreoleTypes::VARCHAR, true, 32);
-
+
-        $tMap->addColumn('APP_NUMBER', 'AppNumber', 'int', CreoleTypes::INTEGER, true, null);
+        $tMap->addColumn('APP_NUMBER', 'AppNumber', 'int', CreoleTypes::INTEGER, true, null);
-
+
-        $tMap->addColumn('APP_PARENT', 'AppParent', 'string', CreoleTypes::VARCHAR, true, 32);
+        $tMap->addColumn('APP_PARENT', 'AppParent', 'string', CreoleTypes::VARCHAR, true, 32);
-
+
-        $tMap->addColumn('APP_STATUS', 'AppStatus', 'string', CreoleTypes::VARCHAR, true, 100);
+        $tMap->addColumn('APP_STATUS', 'AppStatus', 'string', CreoleTypes::VARCHAR, true, 100);
-
+
-        $tMap->addColumn('PRO_UID', 'ProUid', 'string', CreoleTypes::VARCHAR, true, 32);
+        $tMap->addColumn('PRO_UID', 'ProUid', 'string', CreoleTypes::VARCHAR, true, 32);
-
+
-        $tMap->addColumn('APP_PROC_STATUS', 'AppProcStatus', 'string', CreoleTypes::VARCHAR, true, 100);
+        $tMap->addColumn('APP_PROC_STATUS', 'AppProcStatus', 'string', CreoleTypes::VARCHAR, true, 100);
-
+
-        $tMap->addColumn('APP_PROC_CODE', 'AppProcCode', 'string', CreoleTypes::VARCHAR, true, 100);
+        $tMap->addColumn('APP_PROC_CODE', 'AppProcCode', 'string', CreoleTypes::VARCHAR, true, 100);
-
+
-        $tMap->addColumn('APP_PARALLEL', 'AppParallel', 'string', CreoleTypes::VARCHAR, true, 32);
+        $tMap->addColumn('APP_PARALLEL', 'AppParallel', 'string', CreoleTypes::VARCHAR, true, 32);
-
+
-        $tMap->addColumn('APP_INIT_USER', 'AppInitUser', 'string', CreoleTypes::VARCHAR, true, 32);
+        $tMap->addColumn('APP_INIT_USER', 'AppInitUser', 'string', CreoleTypes::VARCHAR, true, 32);
-
+
-        $tMap->addColumn('APP_CUR_USER', 'AppCurUser', 'string', CreoleTypes::VARCHAR, true, 32);
+        $tMap->addColumn('APP_CUR_USER', 'AppCurUser', 'string', CreoleTypes::VARCHAR, true, 32);
-
+
-        $tMap->addColumn('APP_CREATE_DATE', 'AppCreateDate', 'int', CreoleTypes::TIMESTAMP, true, null);
+        $tMap->addColumn('APP_CREATE_DATE', 'AppCreateDate', 'int', CreoleTypes::TIMESTAMP, true, null);
-
+
-        $tMap->addColumn('APP_INIT_DATE', 'AppInitDate', 'int', CreoleTypes::TIMESTAMP, true, null);
+        $tMap->addColumn('APP_INIT_DATE', 'AppInitDate', 'int', CreoleTypes::TIMESTAMP, true, null);
-
+
-        $tMap->addColumn('APP_FINISH_DATE', 'AppFinishDate', 'int', CreoleTypes::TIMESTAMP, false, null);
+        $tMap->addColumn('APP_FINISH_DATE', 'AppFinishDate', 'int', CreoleTypes::TIMESTAMP, false, null);
-
+
-        $tMap->addColumn('APP_UPDATE_DATE', 'AppUpdateDate', 'int', CreoleTypes::TIMESTAMP, true, null);
+        $tMap->addColumn('APP_UPDATE_DATE', 'AppUpdateDate', 'int', CreoleTypes::TIMESTAMP, true, null);
-
+
-        $tMap->addColumn('APP_DATA', 'AppData', 'string', CreoleTypes::LONGVARCHAR, true, null);
+        $tMap->addColumn('APP_DATA', 'AppData', 'string', CreoleTypes::LONGVARCHAR, true, null);
-
+
-        $tMap->addColumn('APP_PIN', 'AppPin', 'string', CreoleTypes::VARCHAR, true, 32);
+        $tMap->addColumn('APP_PIN', 'AppPin', 'string', CreoleTypes::VARCHAR, true, 32);
-
+
-        $tMap->addValidator('APP_STATUS', 'validValues', 'propel.validator.ValidValuesValidator', 'DRAFT|TO_DO|PAUSED|COMPLETED|CANCELLED', 'Please select a valid status.');
+        $tMap->addColumn('APP_DURATION', 'AppDuration', 'double', CreoleTypes::DOUBLE, false, null);
-
+
-    } // doBuild()
+        $tMap->addColumn('APP_DELAY_DURATION', 'AppDelayDuration', 'double', CreoleTypes::DOUBLE, false, null);
-
+
-} // ApplicationMapBuilder
+        $tMap->addValidator('APP_STATUS', 'validValues', 'propel.validator.ValidValuesValidator', 'DRAFT|TO_DO|PAUSED|COMPLETED|CANCELLED', 'Please select a valid status.');
+
+    } // doBuild()
+
+} // ApplicationMapBuilder

workflow/engine/classes/model/map/UsersMapBuilder.php

@@ -130,6 +130,10 @@ class UsersMapBuilder
         $tMap->addColumn('USR_TOTAL_COMPLETED', 'UsrTotalCompleted', 'int', CreoleTypes::INTEGER, false, null);
 
         $tMap->addColumn('USR_TOTAL_UNASSIGNED', 'UsrTotalUnassigned', 'int', CreoleTypes::INTEGER, false, null);
+        
+        $tMap->addColumn('USR_COST_BY_HOUR', 'UsrCostByHour', 'double', CreoleTypes::DOUBLE, false, 11,2);
+
+        $tMap->addColumn('USR_UNIT_COST', 'UsrUnitCost', 'string', CreoleTypes::VARCHAR, false, 50);
 
         $tMap->addValidator('USR_STATUS', 'validValues', 'propel.validator.ValidValuesValidator', 'ACTIVE|INACTIVE|VACATION|CLOSED', 'Please select a valid type.');
 

workflow/engine/classes/model/om/BaseUsers.php

@@ -183,6 +183,17 @@ abstract class BaseUsers extends BaseObject implements Persistent
      */
     protected $usr_ux = 'NORMAL';
 
+    /**
+     * The value for the usr_cost_by_hour field.
+     * @var        double
+     */
+    protected $usr_cost_by_hour = 0;
+    
+    /**
+     * The value for the usr_unit_cost field.
+     * @var        string
+     */
+    protected $usr_unit_cost = '';
     /**
      * The value for the usr_total_inbox field.
      * @var        int
@@ -608,6 +619,28 @@ abstract class BaseUsers extends BaseObject implements Persistent
 
         return $this->usr_ux;
     }
+    
+    /**
+     * Get the [usr_cost_by_hour] column value.
+     *
+     * @return     double
+     */
+    public function getUsrCostByHour()
+    {
+    
+    	return $this->usr_cost_by_hour;
+    }
+    
+    /**
+     * Get the [usr_unit_cost] column value.
+     *
+     * @return     string
+     */
+    public function getUsrUnitCost()
+    {
+    
+    	return $this->usr_unit_cost;
+    }
 
     /**
      * Get the [usr_total_inbox] column value.
@@ -1286,6 +1319,44 @@ abstract class BaseUsers extends BaseObject implements Persistent
 
     } // setUsrUx()
 
+    /**
+     * Set the value of [usr_cost_by_hour] column.
+     *
+     * @param      double $v new value
+     * @return     void
+     */
+    public function setUsrCostByHour($v)
+    {
+    
+    	if ($this->usr_cost_by_hour !== $v || $v === 0) {
+    		$this->usr_cost_by_hour = $v;
+    		$this->modifiedColumns[] = UsersPeer::USR_COST_BY_HOUR;
+    	}
+    
+    } // setUsrCostByHour()
+    
+    /**
+     * Set the value of [usr_unit_cost] column.
+     *
+     * @param      string $v new value
+     * @return     void
+     */
+    public function setUsrUnitCost($v)
+    {
+    
+    	// Since the native PHP type for this column is string,
+    	// we will cast the input to a string (if it is not).
+    	if ($v !== null && !is_string($v)) {
+    		$v = (string) $v;
+    	}
+    
+    	if ($this->usr_unit_cost !== $v || $v === '') {
+    		$this->usr_unit_cost = $v;
+    		$this->modifiedColumns[] = UsersPeer::USR_UNIT_COST;
+    	}
+    
+    } // setUsrUnitCost()
+
     /**
      * Set the value of [usr_total_inbox] column.
      * 
@@ -1509,6 +1580,10 @@ abstract class BaseUsers extends BaseObject implements Persistent
 
             $this->usr_ux = $rs->getString($startcol + 25);
 
+            $this->usr_cost_by_hour = $rs->getFloat($startcol + 26);
+
+            $this->usr_unit_cost = $rs->getString($startcol + 27);
+
             $this->usr_total_inbox = $rs->getInt($startcol + 26);
 
             $this->usr_total_draft = $rs->getInt($startcol + 27);
@@ -1528,7 +1603,7 @@ abstract class BaseUsers extends BaseObject implements Persistent
             $this->setNew(false);
 
             // FIXME - using NUM_COLUMNS may be clearer.
-            return $startcol + 33; // 33 = UsersPeer::NUM_COLUMNS - UsersPeer::NUM_LAZY_LOAD_COLUMNS).
+            return $startcol + 35; // 35 = UsersPeer::NUM_COLUMNS - UsersPeer::NUM_LAZY_LOAD_COLUMNS).
 
         } catch (Exception $e) {
             throw new PropelException("Error populating Users object", $e);
@@ -1831,6 +1906,12 @@ abstract class BaseUsers extends BaseObject implements Persistent
             case 32:
                 return $this->getUsrTotalUnassigned();
                 break;
+            case 33:
+                return $this->getUsrCostByHour();
+                break;
+            case 34:
+                return $this->getUsrUnitCost();
+                break;
             default:
                 return null;
                 break;
@@ -1884,6 +1965,8 @@ abstract class BaseUsers extends BaseObject implements Persistent
             $keys[30] => $this->getUsrTotalPaused(),
             $keys[31] => $this->getUsrTotalCompleted(),
             $keys[32] => $this->getUsrTotalUnassigned(),
+        	$keys[33] => $this->getUsrCostByHour(),
+        	$keys[34] => $this->getUsrUnitCost(),
         );
         return $result;
     }
@@ -2014,6 +2097,12 @@ abstract class BaseUsers extends BaseObject implements Persistent
             case 32:
                 $this->setUsrTotalUnassigned($value);
                 break;
+            case 26:
+                $this->setUsrCostByHour($value);
+                break;
+            case 27:
+                $this->setUsrUnitCost($value);
+                break;
         } // switch()
     }
 
@@ -2169,6 +2258,14 @@ abstract class BaseUsers extends BaseObject implements Persistent
             $this->setUsrTotalUnassigned($arr[$keys[32]]);
         }
 
+        if (array_key_exists($keys[33], $arr)) {
+        	$this->setUsrCostByHour($arr[$keys[26]]);
+        }
+
+        if (array_key_exists($keys[34], $arr)) {
+        	$this->setUsrUnitCost($arr[$keys[27]]);
+        }
+
     }
 
     /**
@@ -2312,6 +2409,13 @@ abstract class BaseUsers extends BaseObject implements Persistent
             $criteria->add(UsersPeer::USR_TOTAL_UNASSIGNED, $this->usr_total_unassigned);
         }
 
+        if ($this->isColumnModified(UsersPeer::USR_COST_BY_HOUR)) {
+        	$criteria->add(UsersPeer::USR_COST_BY_HOUR, $this->usr_cost_by_hour);
+        }
+
+        if ($this->isColumnModified(UsersPeer::USR_UNIT_COST)) {
+        	$criteria->add(UsersPeer::USR_UNIT_COST, $this->usr_unit_cost);
+        }
 
         return $criteria;
     }
@@ -2429,7 +2533,10 @@ abstract class BaseUsers extends BaseObject implements Persistent
         $copyObj->setUsrTotalCompleted($this->usr_total_completed);
 
         $copyObj->setUsrTotalUnassigned($this->usr_total_unassigned);
-
+        
+        $copyObj->setUsrCostByHour($this->usr_cost_by_hour);
+        
+        $copyObj->setUsrUnitCost($this->usr_unit_cost);
 
         $copyObj->setNew(true);
 

workflow/engine/config/schema.xml

@@ -1476,6 +1476,8 @@
     <column name="USR_TOTAL_PAUSED" type="INTEGER" default="0"/>
     <column name="USR_TOTAL_COMPLETED" type="INTEGER" default="0"/>
     <column name="USR_TOTAL_UNASSIGNED" type="INTEGER" default="0"/>
+    <column name="USR_COST_BY_HOUR" type="DOUBLE" size="11,2" required="false" default="0"/>
+    <column name="USR_UNIT_COST" type="VARCHAR" size="50" required="false" default=""/>
     <validator column="USR_STATUS">
       <rule name="validValues" value="ACTIVE|INACTIVE|VACATION|CLOSED" message="Please select a valid type."/>
       <rule name="required" message="Type is required."/>
@@ -4816,5 +4818,217 @@
       </vendor>
     </column>
   </table>
+  
+  <table name="USR_REPORTING">
+        <vendor type="mysql">
+            <parameter name="Name" value="USR_REPORTING" />
+            <parameter name="Engine" value="InnoDB" />
+            <parameter name="Version" value="10" />
+            <parameter name="Row_format" value="Dynamic" />
+            <parameter name="Data_free" value="0" />
+            <parameter name="Auto_increment" value="" />
+            <parameter name="Check_time" value="" />
+            <parameter name="Collation" value="utf8_general_ci" />
+            <parameter name="Checksum" value="" />
+            <parameter name="Create_options" value="" />
+            <parameter name="Comment" value="Data calculated users by task"/>
+        </vendor>
+        <column name="USR_UID"              type="VARCHAR"  size="32" required="true" primaryKey="true" />
+        <column name="TAS_UID"              type="VARCHAR"  size="32" required="true" primaryKey="true" />
+        <column name="PRO_UID"              type="VARCHAR"  size="32" required="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="TOTAL_TIME_BY_TASK"   type="DECIMAL"  size="7,2"/>
+        <column name="TOTAL_CASES_IN"       type="DECIMAL"  size="7,2"/>
+        <column name="TOTAL_CASES_OUT"      type="DECIMAL"  size="7,2"/>
+        <column name="USER_HOUR_COST"       type="DECIMAL"  size="7,2"/>
+        <column name="AVG_TIME"             type="DECIMAL"  size="7,2"/>
+        <column name="SDV_TIME"             type="DECIMAL"  size="7,2"/>
+        <column name="CONFIGURED_TASK_TIME" type="DECIMAL"  size="7,2"/>
+        <column name="TOTAL_CASES_OVERDUE"  type="DECIMAL"  size="7,2"/>
+        <column name="TOTAL_CASES_ON_TIME"  type="DECIMAL"  size="7,2"/>
+        <index name="indexReporting">
+            <index-column name="USR_UID"/>
+            <index-column name="TAS_UID"/>
+            <index-column name="PRO_UID"/>
+            <vendor type="mysql">
+                <parameter name="Table" value="USR_REPORTING"/>
+                <parameter name="Non_unique" value="1"/>
+                <parameter name="Key_name" value="indexReporting"/>
+                <parameter name="Seq_in_index" value="1"/>
+                <parameter name="Column_name" value="USR_UID"/>
+                <parameter name="Collation" value="A"/>
+                <parameter name="Cardinality" value=""/>
+                <parameter name="Sub_part" value=""/>
+                <parameter name="Packed" value=""/>
+                <parameter name="Null" value=""/>
+                <parameter name="Index_type" value="BTREE"/>
+                <parameter name="Comment" value=""/>
+            </vendor>
+        </index>
+    </table>
+
+    <table name="PRO_REPORTING">
+        <vendor type="mysql">
+            <parameter name="Name" value="PRO_REPORTING" />
+            <parameter name="Engine" value="InnoDB" />
+            <parameter name="Version" value="10" />
+            <parameter name="Row_format" value="Dynamic" />
+            <parameter name="Data_free" value="0" />
+            <parameter name="Auto_increment" value="" />
+            <parameter name="Check_time" value="" />
+            <parameter name="Collation" value="utf8_general_ci" />
+            <parameter name="Checksum" value="" />
+            <parameter name="Create_options" value="" />
+            <parameter name="Comment" value="Data calculated by process"/>
+        </vendor>
+        <column name="PRO_UID"                  type="VARCHAR"  size="32" required="true" 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="AVG_TIME"                 type="DECIMAL"  size="7,2"/>
+        <column name="SDV_TIME"                 type="DECIMAL"  size="7,2"/>
+        <column name="TOTAL_CASES_IN"           type="DECIMAL"  size="7,2"/>
+        <column name="TOTAL_CASES_OUT"          type="DECIMAL"  size="7,2"/>
+        <column name="CONFIGURED_PROCESS_TIME"  type="DECIMAL"  size="7,2"/>
+        <column name="CONFIGURED_PROCESS_COST"  type="DECIMAL"  size="7,2"/>
+        <column name="TOTAL_CASES_OPEN"         type="DECIMAL"  size="7,2"/>
+        <column name="TOTAL_CASES_OVERDUE"      type="DECIMAL"  size="7,2"/>
+        <column name="TOTAL_CASES_ON_TIME"      type="DECIMAL"  size="7,2"/>
+    </table>
+
+    <table name="DASHBOARD">
+        <vendor type="mysql">
+            <parameter name="Name" value="DASHBOARD" />
+            <parameter name="Engine" value="InnoDB" />
+            <parameter name="Version" value="10" />
+            <parameter name="Row_format" value="Dynamic" />
+            <parameter name="Data_free" value="0" />
+            <parameter name="Auto_increment" value="" />
+            <parameter name="Check_time" value="" />
+            <parameter name="Collation" value="utf8_general_ci" />
+            <parameter name="Checksum" value="" />
+            <parameter name="Create_options" value="" />
+            <parameter name="Comment" value="Dashboard definitions."/>
+        </vendor>
+        <column name="DAS_UID"          type="VARCHAR"      size="32" required="true" primaryKey="true" default="" />
+        <column name="DAS_TITLE"        type="VARCHAR"      size="255" required="true" default="" />
+        <column name="DAS_DESCRIPTION"  type="LONGVARCHAR"  required="false" />
+        <column name="DAS_CREATE_DATE"  type="TIMESTAMP"    required="true" />
+        <column name="DAS_UPDATE_DATE"  type="TIMESTAMP"    required="false" />
+        <column name="DAS_STATUS"       type="TINYINT"      required="true" default="1"/>
+    </table>
+
+    <table name="DASHBOARD_INDICATOR">
+        <vendor type="mysql">
+            <parameter name="Name" value="DASHBOARD_INDICATOR" />
+            <parameter name="Engine" value="InnoDB" />
+            <parameter name="Version" value="10" />
+            <parameter name="Row_format" value="Dynamic" />
+            <parameter name="Data_free" value="0" />
+            <parameter name="Auto_increment" value="" />
+            <parameter name="Check_time" value="" />
+            <parameter name="Collation" value="utf8_general_ci" />
+            <parameter name="Checksum" value="" />
+            <parameter name="Create_options" value="" />
+            <parameter name="Comment" value="Dashboard Indicators definitions."/>
+        </vendor>
+        <column name="DAS_IND_UID"              type="VARCHAR"      size="32" required="true" primaryKey="true"  default="" />
+        <column name="DAS_UID"                  type="VARCHAR"      size="32" required="true" default="" />
+        <column name="DAS_IND_TYPE"             type="VARCHAR"      size="32" required="true" default="" />
+        <column name="DAS_IND_TITLE"            type="VARCHAR"      size="255" required="true" default="" />
+        <column name="DAS_IND_GOAL"             type="DECIMAL"      size="7,2" required="true" />
+        <column name="DAS_IND_DIRECTION"        type="TINYINT"      required="true" default="2"/>
+        <column name="DAS_UID_PROCESS"          type="VARCHAR"      size="32" required="true" default="" />
+        <column name="DAS_IND_FIRST_FIGURE"     type="VARCHAR"      size="32" required="false" default="" />
+        <column name="DAS_IND_FIRST_FREQUENCY"  type="VARCHAR"      size="32" required="false" default="" />
+        <column name="DAS_IND_SECOND_FIGURE"    type="VARCHAR"      size="32" required="false" default="" />
+        <column name="DAS_IND_SECOND_FREQUENCY" type="VARCHAR"      size="32" required="false" default="" />
+        <column name="DAS_IND_CREATE_DATE"      type="TIMESTAMP"    required="true" />
+        <column name="DAS_IND_UPDATE_DATE"      type="TIMESTAMP"    required="false" />
+        <column name="DAS_IND_STATUS"           type="TINYINT"      required="true" default="1"/>
+        <foreign-key name="fk_dashboard_indicator_dashboard" foreignTable="DASHBOARD">
+            <reference local="DAS_UID" foreign="DAS_UID"/>
+        </foreign-key>
+        <index name="indexDashboard">
+            <index-column name="DAS_UID"/>
+            <index-column name="DAS_IND_TYPE"/>
+            <vendor type="mysql">
+                <parameter name="Table" value="DASHBOARD_INDICATOR"/>
+                <parameter name="Non_unique" value="1"/>
+                <parameter name="Key_name" value="indexDashboard"/>
+                <parameter name="Seq_in_index" value="1"/>
+                <parameter name="Column_name" value="DAS_UID"/>
+                <parameter name="Collation" value="A"/>
+                <parameter name="Cardinality" value=""/>
+                <parameter name="Sub_part" value=""/>
+                <parameter name="Packed" value=""/>
+                <parameter name="Null" value=""/>
+                <parameter name="Index_type" value="BTREE"/>
+                <parameter name="Comment" value=""/>
+            </vendor>
+        </index>
+    </table>
+
+    <table name="DASHBOARD_DAS_IND">
+        <vendor type="mysql">
+            <parameter name="Name" value="DASHBOARD_DAS_IND" />
+            <parameter name="Engine" value="InnoDB" />
+            <parameter name="Version" value="10" />
+            <parameter name="Row_format" value="Dynamic" />
+            <parameter name="Data_free" value="0" />
+            <parameter name="Auto_increment" value="" />
+            <parameter name="Check_time" value="" />
+            <parameter name="Collation" value="utf8_general_ci" />
+            <parameter name="Checksum" value="" />
+            <parameter name="Create_options" value="" />
+            <parameter name="Comment" value="Dashboard definitions to user."/>
+        </vendor>
+        <column name="DAS_UID"      type="VARCHAR" size="32" required="true" primaryKey="true" default=""/>
+        <column name="OWNER_UID"    type="VARCHAR" size="32" required="true" primaryKey="true" default=""/>
+        <column name="OWNER_TYPE"   type="VARCHAR" size="15" required="true" default=""/>
+        <foreign-key name="fk_dashboard_indicator_dashboard_das_ind" foreignTable="DASHBOARD">
+            <reference local="DAS_UID" foreign="DAS_UID"/>
+        </foreign-key>
+    </table>
+
+    <table name="CATALOG">
+        <vendor type="mysql">
+            <parameter name="Name" value="CATALOG" />
+            <parameter name="Engine" value="InnoDB" />
+            <parameter name="Version" value="10" />
+            <parameter name="Row_format" value="Dynamic" />
+            <parameter name="Data_free" value="0" />
+            <parameter name="Auto_increment" value="" />
+            <parameter name="Check_time" value="" />
+            <parameter name="Collation" value="utf8_general_ci" />
+            <parameter name="Checksum" value="" />
+            <parameter name="Create_options" value="" />
+            <parameter name="Comment" value="Definitions catalog."/>
+        </vendor>
+        <column name="CAT_UID"          type="VARCHAR" size="32"  required="true"  primaryKey="true" default="0"/>
+        <column name="CAT_LABEL_ID"     type="VARCHAR" size="100" required="true"  default=""/>
+        <column name="CAT_TYPE"         type="VARCHAR" size="100" required="true"  primaryKey="true" default=""/>
+        <column name="CAT_FLAG"         type="VARCHAR" size="50"  required="false" default=""/>
+        <column name="CAT_OBSERVATION"  type="LONGVARCHAR"        required="false" default=""/>
+        <column name="CAT_CREATE_DATE"  type="TIMESTAMP"          required="true" />
+        <column name="CAT_UPDATE_DATE"  type="TIMESTAMP"          required="false" />
+        <index name="indexType">
+            <index-column name="CAT_TYPE"/>
+            <vendor type="mysql">
+                <parameter name="Table" value="CATALOG"/>
+                <parameter name="Non_unique" value="1"/>
+                <parameter name="Key_name" value="indexDashboard"/>
+                <parameter name="Seq_in_index" value="1"/>
+                <parameter name="Column_name" value="CAT_TYPE"/>
+                <parameter name="Collation" value="A"/>
+                <parameter name="Cardinality" value=""/>
+                <parameter name="Sub_part" value=""/>
+                <parameter name="Packed" value=""/>
+                <parameter name="Null" value=""/>
+                <parameter name="Index_type" value="BTREE"/>
+                <parameter name="Comment" value=""/>
+            </vendor>
+        </index>
+    </table>
 </database>
 

workflow/engine/data/mysql/insert.sql

@@ -413,7 +413,7 @@ INSERT INTO ISO_SUBDIVISION (IC_UID,IS_UID,IS_NAME)  VALUES
 ('AR', 'B', 'Buenos Aires' ) ,
 ('AR', 'C', 'Distrito Federal' ) ,
 ('AR', 'D', 'San Luis' ) ,
-('AR', 'E', 'Entre Ríos' ) ,
+('AR', 'E', 'Entre Ríos' ) ,
 ('AR', 'F', 'La Rioja' ) ,
 ('AR', 'G', 'Santiago del Estero' ) ,
 ('AR', 'H', 'Chaco' ) ,
@@ -423,14 +423,14 @@ INSERT INTO ISO_SUBDIVISION (IC_UID,IS_UID,IS_NAME)  VALUES
 ('AR', 'M', 'Mendoza' ) ,
 ('AR', 'N', 'Misiones' ) ,
 ('AR', 'P', 'Formosa' ) ,
-('AR', 'Q', 'Neuquén' ) ,
+('AR', 'Q', 'Neuquén' ) ,
-('AR', 'R', 'Río Negro' ) ,
+('AR', 'R', 'Río Negro' ) ,
 ('AR', 'S', 'Santa Fe' ) ,
-('AR', 'T', 'Tucumán' ) ,
+('AR', 'T', 'Tucumán' ) ,
 ('AR', 'U', 'Chubut' ) ,
 ('AR', 'V', 'Tierra del Fuego' ) ,
 ('AR', 'W', 'Corrientes' ) ,
-('AR', 'X', 'Córdoba' ) ,
+('AR', 'X', 'Córdoba' ) ,
 ('AR', 'Y', 'Jujuy' ) ,
 ('AR', 'Z', 'Santa Cruz' ) ,
 ('AU', 'CT', 'Australian Capital Territory' ) ,
@@ -441,17 +441,17 @@ INSERT INTO ISO_SUBDIVISION (IC_UID,IS_UID,IS_NAME)  VALUES
 ('AU', 'TS', 'Tasmania' ) ,
 ('AU', 'VI', 'Victoria' ) ,
 ('AU', 'WA', 'Western Australia' ) ,
-('BE', 'BRU', 'Bruxelles-Capitale, Région de (fr), Brussels Hoofdstedelijk Gewest (nl)' ) ,
+('BE', 'BRU', 'Bruxelles-Capitale, Région de (fr), Brussels Hoofdstedelijk Gewest (nl)' ) ,
 ('BE', 'VAN', 'Antwerpen   (VLG)' ) ,
 ('BE', 'VBR', 'Vlaams Brabant (VLG)' ) ,
 ('BE', 'VLG', 'Vlaamse Gewest (nl)' ) ,
 ('BE', 'VLI', 'Limburg (VLG)' ) ,
 ('BE', 'VOV', 'Oost-Vlaanderen (VLG)' ) ,
 ('BE', 'VWV', 'West-Vlaanderen (VLG)' ) ,
-('BE', 'WAL', 'Wallonne, Région (fr)' ) ,
+('BE', 'WAL', 'Wallonne, Région (fr)' ) ,
 ('BE', 'WBR', 'Brabant Wallon (WAL)' ) ,
 ('BE', 'WHT', 'Hainaut (WAL)' ) ,
-('BE', 'WLG', 'Liège (WAL)' ) ,
+('BE', 'WLG', 'Liège (WAL)' ) ,
 ('BE', 'WLX', 'Luxembourg (WAL)' ) ,
 ('BE', 'WNA', 'Namur (WAL)' ) ,
 ('BO', 'B', 'El Beni' ) ,
@@ -460,35 +460,35 @@ INSERT INTO ISO_SUBDIVISION (IC_UID,IS_UID,IS_NAME)  VALUES
 ('BO', 'L', 'La Paz' ) ,
 ('BO', 'N', 'Pando' ) ,
 ('BO', 'O', 'Oruro' ) ,
-('BO', 'P', 'Potosí' ) ,
+('BO', 'P', 'Potosí' ) ,
 ('BO', 'S', 'Santa Cruz' ) ,
 ('BO', 'T', 'Tarija' ) ,
 ('BR', 'AC', 'Acre' ) ,
 ('BR', 'AL', 'Alagoas' ) ,
 ('BR', 'AM', 'Amazonas' ) ,
-('BR', 'AP', 'Amapá' ) ,
+('BR', 'AP', 'Amapá' ) ,
 ('BR', 'BA', 'Bahia' ) ,
-('BR', 'CE', 'Ceará' ) ,
+('BR', 'CE', 'Ceará' ) ,
 ('BR', 'DF', 'Distrito Federal' ) ,
-('BR', 'ES', 'Espírito Santo' ) ,
+('BR', 'ES', 'Espírito Santo' ) ,
-('BR', 'GO', 'Goiás' ) ,
+('BR', 'GO', 'Goiás' ) ,
-('BR', 'MA', 'Maranhão' ) ,
+('BR', 'MA', 'Maranhão' ) ,
 ('BR', 'MG', 'Minas Gerais' ) ,
 ('BR', 'MS', 'Mato Grosso do Sul' ) ,
 ('BR', 'MT', 'Mato Grosso' ) ,
-('BR', 'PA', 'Pará' ) ,
+('BR', 'PA', 'Pará' ) ,
-('BR', 'PB', 'Paraíba' ) ,
+('BR', 'PB', 'Paraíba' ) ,
 ('BR', 'PE', 'Pernambuco' ) ,
-('BR', 'PI', 'Piauí' ) ,
+('BR', 'PI', 'Piauí' ) ,
-('BR', 'PR', 'Paraná' ) ,
+('BR', 'PR', 'Paraná' ) ,
 ('BR', 'RJ', 'Rio de Janeiro' ) ,
 ('BR', 'RN', 'Rio Grande do Norte' ) ,
-('BR', 'RO', 'Rondônia' ) ,
+('BR', 'RO', 'Rondônia' ) ,
 ('BR', 'RR', 'Roraima' ) ,
 ('BR', 'RS', 'Rio Grande do Sul' ) ,
 ('BR', 'SC', 'Santa Catarina' ) ,
 ('BR', 'SE', 'Sergipe' ) ,
-('BR', 'SP', 'São Paulo' ) ;
+('BR', 'SP', 'São Paulo' ) ;
 INSERT INTO ISO_SUBDIVISION (IC_UID,IS_UID,IS_NAME)  VALUES  
 ('BR', 'TO', 'Tocantins' ) ,
 ('CA', 'AB', 'Alberta' ) ,
@@ -511,12 +511,12 @@ INSERT INTO ISO_SUBDIVISION (IC_UID,IS_UID,IS_NAME)  VALUES
 ('CH', 'BL', 'Basel-Landschaft (de)' ) ,
 ('CH', 'BS', 'Basel-Stadt (de)' ) ,
 ('CH', 'FR', 'Fribourg (fr)' ) ,
-('CH', 'GE', 'Genève (fr)' ) ,
+('CH', 'GE', 'Genève (fr)' ) ,
 ('CH', 'GL', 'Glarus (de)' ) ,
-('CH', 'GR', 'Graubünden (de)' ) ,
+('CH', 'GR', 'Graubünden (de)' ) ,
 ('CH', 'JU', 'Jura (fr)' ) ,
 ('CH', 'LU', 'Luzern (de)' ) ,
-('CH', 'NE', 'Neuchâtel (fr)' ) ,
+('CH', 'NE', 'Neuchâtel (fr)' ) ,
 ('CH', 'NW', 'Nidwalden (de)' ) ,
 ('CH', 'OW', 'Obwalden (de)' ) ,
 ('CH', 'SG', 'Sankt Gallen (de)' ) ,
@@ -529,20 +529,20 @@ INSERT INTO ISO_SUBDIVISION (IC_UID,IS_UID,IS_NAME)  VALUES
 ('CH', 'VD', 'Vaud (fr)' ) ,
 ('CH', 'VS', 'Valais (fr)' ) ,
 ('CH', 'ZG', 'Zug (de)' ) ,
-('CH', 'ZH', 'Zürich (de)' ) ,
+('CH', 'ZH', 'Zürich (de)' ) ,
-('CL', 'AI', 'Aisén del General Carlos Ibáñez del Campo' ) ,
+('CL', 'AI', 'Aisén del General Carlos Ibáñez del Campo' ) ,
 ('CL', 'AN', 'Antofagasta' ) ,
-('CL', 'AR', 'La Araucanía' ) ,
+('CL', 'AR', 'La Araucanía' ) ,
 ('CL', 'AT', 'Atacama' ) ,
-('CL', 'BI', 'Biobío' ) ,
+('CL', 'BI', 'Biobío' ) ,
 ('CL', 'CO', 'Coquimbo' ) ,
 ('CL', 'LI', 'Libertador General Bernardo O''Higgins' ) ,
 ('CL', 'LL', 'Los Lagos' ) ,
 ('CL', 'MA', 'Magallanes' ) ,
 ('CL', 'ML', 'Maule' ) ,
-('CL', 'RM', 'Regón Metropolitana de Santiago' ) ,
+('CL', 'RM', 'Regón Metropolitana de Santiago' ) ,
-('CL', 'TA', 'Tarapacá' ) ,
+('CL', 'TA', 'Tarapacá' ) ,
-('CL', 'VS', 'Valparaíso' ) ,
+('CL', 'VS', 'Valparaíso' ) ,
 ('CN', '11', 'Beijing' ) ,
 ('CN', '12', 'Tianjin' ) ,
 ('CN', '13', 'Hebei' ) ,
@@ -582,16 +582,16 @@ INSERT INTO ISO_SUBDIVISION (IC_UID,IS_UID,IS_NAME)  VALUES
 ('CR', 'C', 'Cartago' ) ,
 ('CR', 'G', 'Guanacaste' ) ,
 ('CR', 'H', 'Heredia' ) ,
-('CR', 'L', 'Limón' ) ,
+('CR', 'L', 'Limón' ) ,
 ('CR', 'P', 'Puntarenas' ) ,
-('CR', 'SJ', 'San José' ) ,
+('CR', 'SJ', 'San José' ) ,
 ('CS', 'CG', 'Crna Gora' ) ,
 ('CS', 'KM', 'Kosovo-Metohija' ) ,
 ('CS', 'SR', 'Srbija' ) ,
 ('CS', 'VO', 'Vojvodina' ) ,
 ('DE', 'BE', 'Berlin' ) ,
 ('DE', 'BR', 'Brandenburg' ) ,
-('DE', 'BW', 'Baden-Württemberg' ) ,
+('DE', 'BW', 'Baden-Württemberg' ) ,
 ('DE', 'BY', 'Bayern' ) ,
 ('DE', 'HB', 'Bremen (Hansestadt)' ) ,
 ('DE', 'HE', 'Hessen' ) ,
@@ -604,68 +604,68 @@ INSERT INTO ISO_SUBDIVISION (IC_UID,IS_UID,IS_NAME)  VALUES
 ('DE', 'SL', 'Saarland' ) ,
 ('DE', 'SN', 'Sachsen' ) ,
 ('DE', 'ST', 'Sachsen-Anhalt' ) ,
-('DE', 'TH', 'Thüringen' ) ,
+('DE', 'TH', 'Thüringen' ) ,
 ('EE', '37', 'Harjumaa' ) ,
 ('EE', '39', 'Hiiumaa' ) ,
 ('EE', '44', 'Ida-Virumaa' ) ,
-('EE', '49', 'Jõgevamaa' ) ,
+('EE', '49', 'Jõgevamaa' ) ,
-('EE', '51', 'Järvamaa' ) ,
+('EE', '51', 'Järvamaa' ) ,
-('EE', '57', 'Läänemaa' ) ,
+('EE', '57', 'Läänemaa' ) ,
-('EE', '59', 'Lääne-Virumaa' ) ,
+('EE', '59', 'Lääne-Virumaa' ) ,
-('EE', '65', 'Põlvamaa' ) ,
+('EE', '65', 'Põlvamaa' ) ,
-('EE', '67', 'Pärnumaa' ) ,
+('EE', '67', 'Pärnumaa' ) ,
 ('EE', '70', 'Raplamaa' ) ,
 ('EE', '74', 'Saaremaa' ) ,
 ('EE', '78', 'Tartumaa' ) ,
 ('EE', '82', 'Valgamaa' ) ,
 ('EE', '84', 'Viljandimaa' ) ,
-('EE', '86', 'Võrumaa' ) ,
+('EE', '86', 'Võrumaa' ) ,
 ('FI', 'AL', 'Ahvenanmaan Maakunta (fi)' ) ,
-('FI', 'ES', 'Etelä-Suomen lääni (fi)' ) ,
+('FI', 'ES', 'Etelä-Suomen lääni (fi)' ) ,
-('FI', 'IS', 'Itä-Suomen lääni (fi)' ) ,
+('FI', 'IS', 'Itä-Suomen lääni (fi)' ) ,
-('FI', 'LL', 'Lapin lääni (fi)' ) ,
+('FI', 'LL', 'Lapin lääni (fi)' ) ,
-('FI', 'LS', 'Länsi-Suomen lääni (fi)' ) ,
+('FI', 'LS', 'Länsi-Suomen lääni (fi)' ) ,
-('FI', 'OL', 'Oulun lääni (fi)' ) ,
+('FI', 'OL', 'Oulun lääni (fi)' ) ,
 ('FR', '01', 'Ain' ) ,
 ('FR', '02', 'Aisne' ) ,
 ('FR', '03', 'Allier' ) ,
 ('FR', '04', 'Alpes-de-Haute-Provence' ) ,
 ('FR', '05', 'Hautes-Alpes' ) ,
 ('FR', '06', 'Alpes-Maritimes' ) ,
-('FR', '07', 'Ardèche' ) ,
+('FR', '07', 'Ardèche' ) ,
 ('FR', '08', 'Ardennes' ) ,
-('FR', '09', 'Ariège' ) ,
+('FR', '09', 'Ariège' ) ,
 ('FR', '10', 'Aube' ) ,
 ('FR', '11', 'Aude' ) ,
 ('FR', '12', 'Aveyron' ) ,
-('FR', '13', 'Bouches-du-Rhône' ) ,
+('FR', '13', 'Bouches-du-Rhône' ) ,
 ('FR', '14', 'Calvados' ) ,
 ('FR', '15', 'Cantal' ) ,
 ('FR', '16', 'Charente' ) ,
 ('FR', '17', 'Charente-Maritime' ) ,
 ('FR', '18', 'Cher' ) ,
-('FR', '19', 'Corrèze' ) ,
+('FR', '19', 'Corrèze' ) ,
-('FR', '21', 'Côte-d''Or' ) ,
+('FR', '21', 'Côte-d''Or' ) ,
-('FR', '22', 'Côtes-d''Armor' ) ,
+('FR', '22', 'Côtes-d''Armor' ) ,
 ('FR', '23', 'Creuse' ) ,
 ('FR', '24', 'Dordogne' ) ,
 ('FR', '25', 'Doubs' ) ,
-('FR', '26', 'Drôme' ) ;
+('FR', '26', 'Drôme' ) ;
 INSERT INTO ISO_SUBDIVISION (IC_UID,IS_UID,IS_NAME)  VALUES  
 ('FR', '27', 'Eure' ) ,
 ('FR', '28', 'Eure-et-Loir' ) ,
-('FR', '29', 'Finistère' ) ,
+('FR', '29', 'Finistère' ) ,
 ('FR', '2A', 'Corse-du-Sud' ) ,
 ('FR', '2B', 'Haute-Corse' ) ,
 ('FR', '30', 'Gard' ) ,
 ('FR', '31', 'Haute-Garonne' ) ,
 ('FR', '32', 'Gers' ) ,
 ('FR', '33', 'Gironde' ) ,
-('FR', '34', 'Hérault' ) ,
+('FR', '34', 'Hérault' ) ,
 ('FR', '35', 'Ille-et-Vilaine' ) ,
 ('FR', '36', 'Indre' ) ,
 ('FR', '37', 'Indre-et-Loire' ) ,
-('FR', '38', 'Isère' ) ,
+('FR', '38', 'Isère' ) ,
 ('FR', '39', 'Jura' ) ,
 ('FR', '40', 'Landes' ) ,
 ('FR', '41', 'Loir-et-Cher' ) ,
@@ -675,7 +675,7 @@ INSERT INTO ISO_SUBDIVISION (IC_UID,IS_UID,IS_NAME)  VALUES
 ('FR', '45', 'Loiret' ) ,
 ('FR', '46', 'Lot' ) ,
 ('FR', '47', 'Lot-et-Garonne' ) ,
-('FR', '48', 'Lozère' ) ,
+('FR', '48', 'Lozère' ) ,
 ('FR', '49', 'Maine-et-Loire' ) ,
 ('FR', '50', 'Manche' ) ,
 ('FR', '51', 'Marne' ) ,
@@ -685,20 +685,20 @@ INSERT INTO ISO_SUBDIVISION (IC_UID,IS_UID,IS_NAME)  VALUES
 ('FR', '55', 'Meuse' ) ,
 ('FR', '56', 'Morbihan' ) ,
 ('FR', '57', 'Moselle' ) ,
-('FR', '58', 'Nièvre' ) ,
+('FR', '58', 'Nièvre' ) ,
 ('FR', '59', 'Nord' ) ,
 ('FR', '60', 'Oise' ) ,
 ('FR', '61', 'Orne' ) ,
 ('FR', '62', 'Pas-de-Calais' ) ,
-('FR', '63', 'Puy-de-Dôme' ) ,
+('FR', '63', 'Puy-de-Dôme' ) ,
-('FR', '64', 'Pyrénées-Atlantiques' ) ,
+('FR', '64', 'Pyrénées-Atlantiques' ) ,
-('FR', '65', 'Hautes-Pyrénées' ) ,
+('FR', '65', 'Hautes-Pyrénées' ) ,
-('FR', '66', 'Pyrénées-Orientales' ) ,
+('FR', '66', 'Pyrénées-Orientales' ) ,
 ('FR', '67', 'Bas-Rhin' ) ,
 ('FR', '68', 'Haut-Rhin' ) ,
-('FR', '69', 'Rhône' ) ,
+('FR', '69', 'Rhône' ) ,
-('FR', '70', 'Haute-Saône' ) ,
+('FR', '70', 'Haute-Saône' ) ,
-('FR', '71', 'Saône-et-Loire' ) ,
+('FR', '71', 'Saône-et-Loire' ) ,
 ('FR', '72', 'Sarthe' ) ,
 ('FR', '73', 'Savoie' ) ,
 ('FR', '74', 'Haute-Savoie' ) ,
@@ -706,13 +706,13 @@ INSERT INTO ISO_SUBDIVISION (IC_UID,IS_UID,IS_NAME)  VALUES
 ('FR', '76', 'Seine-Maritime' ) ,
 ('FR', '77', 'Seine-et-Marne' ) ,
 ('FR', '78', 'Yvelines' ) ,
-('FR', '79', 'Deux-Sèvres' ) ,
+('FR', '79', 'Deux-Sèvres' ) ,
 ('FR', '80', 'Somme' ) ,
 ('FR', '81', 'Tarn' ) ,
 ('FR', '82', 'Tarn-et-Garonne' ) ,
 ('FR', '83', 'Var' ) ,
 ('FR', '84', 'Vaucluse' ) ,
-('FR', '85', 'Vendée' ) ,
+('FR', '85', 'Vendée' ) ,
 ('FR', '86', 'Vienne' ) ,
 ('FR', '87', 'Haute-Vienne' ) ,
 ('FR', '88', 'Vosges' ) ,
@@ -726,7 +726,7 @@ INSERT INTO ISO_SUBDIVISION (IC_UID,IS_UID,IS_NAME)  VALUES
 ('GB', 'ABD', 'Aberdeenshire' ) ,
 ('GB', 'ABE', 'Aberdeen City' ) ,
 ('GB', 'AGB', 'Argyll and Bute' ) ,
-('GB', 'AGY', 'Isle of Anglesey [ Sir Ynys Môn GB-YNM]' ) ,
+('GB', 'AGY', 'Isle of Anglesey [ Sir Ynys Môn GB-YNM]' ) ,
 ('GB', 'ANS', 'Angus' ) ,
 ('GB', 'ANT', 'Antrim' ) ,
 ('GB', 'ARD', 'Ards' ) ,
@@ -990,12 +990,12 @@ INSERT INTO ISO_SUBDIVISION (IC_UID,IS_UID,IS_NAME)  VALUES
 ('GM', 'N', 'North Bank' ) ,
 ('GM', 'U', 'Upper River' ) ,
 ('GM', 'W', 'Western' ) ,
-('GW', 'BA', 'Bafatá' ) ,
+('GW', 'BA', 'Bafatá' ) ,
 ('GW', 'BL', 'Bolama' ) ,
 ('GW', 'BM', 'Biombo' ) ,
 ('GW', 'BS', 'Bissau' ) ,
 ('GW', 'CA', 'Cacheu' ) ,
-('GW', 'GA', 'Gabù' ) ,
+('GW', 'GA', 'Gabù' ) ,
 ('GW', 'OI', 'Oio' ) ,
 ('GW', 'QU', 'Quinara' ) ,
 ('GW', 'TO', 'Tombali' ) ,
@@ -1006,7 +1006,7 @@ INSERT INTO ISO_SUBDIVISION (IC_UID,IS_UID,IS_NAME)  VALUES
 ('IN', 'BR', 'Bihar' ) ,
 ('IN', 'CH', 'Chandigarh' ) ,
 ('IN', 'CT', 'Chhattisgarh' ) ,
-('IN', 'DD', 'Damán y Diu' ) ,
+('IN', 'DD', 'Damán y Diu' ) ,
 ('IN', 'DL', 'Delhi' ) ,
 ('IN', 'DN', 'Dadra y Nagar Haveli' ) ,
 ('IN', 'GA', 'Goa' ) ,
@@ -1084,7 +1084,7 @@ INSERT INTO ISO_SUBDIVISION (IC_UID,IS_UID,IS_NAME)  VALUES
 ('JP', '47', 'Okinawa' ) ,
 ('KM', 'A', 'Anjouan' ) ,
 ('KM', 'G', 'Grande Comore' ) ,
-('KM', 'M', 'Mohéli' ) ,
+('KM', 'M', 'Mohéli' ) ,
 ('KR', '11', 'Seoul Teugbyeolsi [Seoul-T'' kpy lshi]' ) ,
 ('KR', '26', 'Busan Gwang''yeogsi [Pusan-Kwangy kshi]' ) ,
 ('KR', '27', 'Daegu Gwang''yeogsi [Taegu-Kwangy kshi]' ) ,
@@ -1102,26 +1102,26 @@ INSERT INTO ISO_SUBDIVISION (IC_UID,IS_UID,IS_NAME)  VALUES
 ('KR', '48', 'Gyeongsangnamdo [Ky ngsangnam-do]' ) ,
 ('KR', '49', 'Jejudo [Cheju-do]' ) ,
 ('LV', 'AI', 'Aizkraukle' ) ,
-('LV', 'AL', 'Alūksne' ) ,
+('LV', 'AL', 'Alūksne' ) ,
 ('LV', 'BL', 'Balvi' ) ,
 ('LV', 'BU', 'Bauska' ) ,
-('LV', 'CE', 'Cēsis' ) ,
+('LV', 'CE', 'CÄ“sis' ) ,
 ('LV', 'DA', 'Daugavpils' ) ,
 ('LV', 'DO', 'Dobele' ) ,
 ('LV', 'GU', 'Gulbene' ) ,
-('LV', 'JK', 'Jēkabpils' ) ,
+('LV', 'JK', 'JÄ“kabpils' ) ,
 ('LV', 'JL', 'Jelgava' ) ,
-('LV', 'JUR', 'Jūrmala' ) ,
+('LV', 'JUR', 'JÅ«rmala' ) ,
-('LV', 'KR', 'Krāslava' ) ,
+('LV', 'KR', 'KrÄ<EFBFBD>slava' ) ,
-('LV', 'KU', 'Kuldīga' ) ,
+('LV', 'KU', 'Kuldīga' ) ,
-('LV', 'LE', 'Liepāja' ) ,
+('LV', 'LE', 'LiepÄ<EFBFBD>ja' ) ,
-('LV', 'LM', 'Limbaži' ) ,
+('LV', 'LM', 'Limbaži' ) ,
 ('LV', 'LPX', 'Liepdja' ) ,
 ('LV', 'LU', 'Ludza' ) ,
 ('LV', 'MA', 'Madona' ) ,
 ('LV', 'OG', 'Ogre' ) ,
-('LV', 'PR', 'Preiļi' ) ,
+('LV', 'PR', 'Preiļi' ) ,
-('LV', 'RE', 'Rēzekne' ) ,
+('LV', 'RE', 'RÄ“zekne' ) ,
 ('LV', 'RI', 'Riga' ) ,
 ('LV', 'SA', 'Saldus' ) ,
 ('LV', 'TA', 'Talsi' ) ,
@@ -1144,25 +1144,25 @@ INSERT INTO ISO_SUBDIVISION (IC_UID,IS_UID,IS_NAME)  VALUES
 ('MX', 'GUA', 'Guanajuato' ) ,
 ('MX', 'HID', 'Hidalgo' ) ,
 ('MX', 'JAL', 'Jalisco' ) ,
-('MX', 'MEX', 'México' ) ,
+('MX', 'MEX', 'México' ) ,
-('MX', 'MIC', 'Michoacán' ) ,
+('MX', 'MIC', 'Michoacán' ) ,
 ('MX', 'MOR', 'Morelos' ) ,
 ('MX', 'NAY', 'Nayarit' ) ,
-('MX', 'NLE', 'Nuevo León' ) ,
+('MX', 'NLE', 'Nuevo León' ) ,
 ('MX', 'OAX', 'Oaxaca' ) ,
 ('MX', 'PUE', 'Puebla' ) ,
-('MX', 'QUE', 'Querétaro' ) ,
+('MX', 'QUE', 'Querétaro' ) ,
 ('MX', 'ROO', 'Quintana Roo' ) ,
 ('MX', 'SIN', 'Sinaloa' ) ,
-('MX', 'SLP', 'San Luis Potosí' ) ,
+('MX', 'SLP', 'San Luis Potosí' ) ,
 ('MX', 'SON', 'Sonora' ) ,
 ('MX', 'TAB', 'Tabasco' ) ,
 ('MX', 'TAM', 'Tamaulipas' ) ,
 ('MX', 'TLA', 'Tlaxcala' ) ,
 ('MX', 'VER', 'Veracruz' ) ,
-('MX', 'YUC', 'Yucatán' ) ,
+('MX', 'YUC', 'Yucatán' ) ,
 ('MX', 'ZAC', 'Zacatecas' ) ,
-('NO', '01', 'Østfold' ) ,
+('NO', '01', 'Østfold' ) ,
 ('NO', '02', 'Akershus' ) ,
 ('NO', '03', 'Oslo' ) ,
 ('NO', '04', 'Hedmark' ) ,
@@ -1175,9 +1175,9 @@ INSERT INTO ISO_SUBDIVISION (IC_UID,IS_UID,IS_NAME)  VALUES
 ('NO', '11', 'Rogaland' ) ,
 ('NO', '12', 'Hordaland' ) ,
 ('NO', '14', 'Sogn og Fjordane' ) ,
-('NO', '15', 'Møre og Romsdal' ) ,
+('NO', '15', 'Møre og Romsdal' ) ,
-('NO', '16', 'Sør-Trøndelag' ) ,
+('NO', '16', 'Sør-Trøndelag' ) ,
-('NO', '17', 'Nord-Trøndelag' ) ,
+('NO', '17', 'Nord-Trøndelag' ) ,
 ('NO', '18', 'Nordland' ) ,
 ('NO', '19', 'Troms' ) ,
 ('NO', '20', 'Finnmark' ) ,
@@ -1203,42 +1203,42 @@ INSERT INTO ISO_SUBDIVISION (IC_UID,IS_UID,IS_NAME)  VALUES
 ('PT', '04', 'Braganza' ) ,
 ('PT', '05', 'Castelo Branco' ) ,
 ('PT', '06', 'Coimbra' ) ,
-('PT', '07', 'Évora' ) ,
+('PT', '07', 'Évora' ) ,
 ('PT', '08', 'Faro' ) ,
 ('PT', '09', 'Guarda' ) ,
 ('PT', '10', 'Leiria' ) ,
 ('PT', '11', 'Lisboa' ) ,
 ('PT', '12', 'Portalegre' ) ,
 ('PT', '13', 'Porto' ) ,
-('PT', '14', 'Santarém' ) ,
+('PT', '14', 'Santarém' ) ,
-('PT', '15', 'Setúbal' ) ,
+('PT', '15', 'Setúbal' ) ,
 ('PT', '16', 'Viana do Castelo' ) ,
 ('PT', '17', 'Vila Real' ) ,
 ('PT', '18', 'Viseu' ) ,
-('PT', '20', 'Região Autónoma dos Açores' ) ,
+('PT', '20', 'Região Autónoma dos Açores' ) ,
-('PT', '30', 'Região Autónoma da Madeira' ) ,
+('PT', '30', 'Região Autónoma da Madeira' ) ,
 ('SE', 'AB', 'Stockholms' ) ;
 INSERT INTO ISO_SUBDIVISION (IC_UID,IS_UID,IS_NAME)  VALUES  
 ('SE', 'AC', 'Vesterbottens' ) ,
-('SE', 'BD', 'Norrbottens län' ) ,
+('SE', 'BD', 'Norrbottens län' ) ,
-('SE', 'C', 'Uppsala län' ) ,
+('SE', 'C', 'Uppsala län' ) ,
-('SE', 'D', 'Södermanlands län' ) ,
+('SE', 'D', 'Södermanlands län' ) ,
-('SE', 'E', 'Östergötland' ) ,
+('SE', 'E', 'Östergötland' ) ,
-('SE', 'F', 'Jönköping' ) ,
+('SE', 'F', 'Jönköping' ) ,
 ('SE', 'G', 'Kronoberg' ) ,
 ('SE', 'H', 'Kalmar' ) ,
 ('SE', 'I', 'Gotlands' ) ,
 ('SE', 'K', 'Blekinge' ) ,
-('SE', 'M', 'Skåne' ) ,
+('SE', 'M', 'Skåne' ) ,
 ('SE', 'N', 'Halland' ) ,
-('SE', 'O', 'Västra Götaland' ) ,
+('SE', 'O', 'Västra Götaland' ) ,
-('SE', 'S', 'Värmland' ) ,
+('SE', 'S', 'Värmland' ) ,
-('SE', 'T', 'Örebro' ) ,
+('SE', 'T', 'Örebro' ) ,
-('SE', 'U', 'Västmanland' ) ,
+('SE', 'U', 'Västmanland' ) ,
 ('SE', 'W', 'Dalarna' ) ,
-('SE', 'X', 'Gävleborg' ) ,
+('SE', 'X', 'Gävleborg' ) ,
-('SE', 'Y', 'Västernorrland' ) ,
+('SE', 'Y', 'Västernorrland' ) ,
-('SE', 'Z', 'Jämtland' ) ,
+('SE', 'Z', 'Jämtland' ) ,
 ('TR', '01', 'Adana' ) ,
 ('TR', '02', 'Adiyaman' ) ,
 ('TR', '03', 'Afyon' ) ,
@@ -1267,7 +1267,7 @@ INSERT INTO ISO_SUBDIVISION (IC_UID,IS_UID,IS_NAME)  VALUES
 ('TR', '26', 'Eskisehir' ) ,
 ('TR', '27', 'Gaziantep' ) ,
 ('TR', '28', 'Giresun' ) ,
-('TR', '29', 'Gümüşhane' ) ,
+('TR', '29', 'Gümüşhane' ) ,
 ('TR', '30', 'Hakkari' ) ,
 ('TR', '31', 'Hatay' ) ,
 ('TR', '32', 'Isparta' ) ,
@@ -1281,7 +1281,7 @@ INSERT INTO ISO_SUBDIVISION (IC_UID,IS_UID,IS_NAME)  VALUES
 ('TR', '40', 'Kirsehir' ) ,
 ('TR', '41', 'Kocaeli' ) ,
 ('TR', '42', 'Konya' ) ,
-('TR', '43', 'Kütahya' ) ,
+('TR', '43', 'Kütahya' ) ,
 ('TR', '44', 'Malatya' ) ,
 ('TR', '45', 'Manisa' ) ,
 ('TR', '46', 'Kahramanmaras' ) ,
@@ -3413,7 +3413,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
 ( 'LABEL','ID_INTERMEDIATE_MESSAGE_EVENT','en','Intermediate Message Events (Task Notifications)','2014-01-15') ,
 ( 'LABEL','ID_TEMPLATES','en','Templates','2014-01-15') ,
 ( 'LABEL','ID_PUBLIC','en','Public','2014-01-15') ,
-( 'LABEL','ID_DELETE_INPUTDOCUMENT_CONFIRM','en','The item will be deleted the day of the work hour’s list. Do you want continue?','2014-10-21') ,
+( 'LABEL','ID_DELETE_INPUTDOCUMENT_CONFIRM','en','The item will be deleted the day of the work hour’s list. Do you want continue?','2014-10-21') ,
 ( 'JAVASCRIPT','ID_SUBJECT_FIELD_REQUIRED','en','Subject Field is required.','2014-01-15') ,
 ( 'JAVASCRIPT','ID_MESSAGE_FIELD_REQUIRED','en','Message Field is required.','2014-01-15') ,
 ( 'JAVASCRIPT','ID_TEMPLATE_FIELD_REQUIRED','en','Template Field is required.','2014-01-15') ,
@@ -3639,7 +3639,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
 ( 'LABEL','ID_NOT_WORKSPACE_SPECIFIED','en','No workspace specified!','2014-01-15') ,
 ( 'LABEL','ID_BAD_REQUEST','en','Bad Request!','2014-01-15') ,
 ( 'LABEL','ID_COLOSA_AND_CERTIFIED_PARTNERS','en','Supplied free of charge with no support, certification, warranty, maintenance nor indemnity by Colosa and its Certified Partners.','2014-10-21') ,
-( 'LABEL','ID_COPYRIGHT','en','Copyright © 2003-2011 Colosa, Inc. All rights reserved.','2014-01-15') ,
+( 'LABEL','ID_COPYRIGHT','en','Copyright © 2003-2011 Colosa, Inc. All rights reserved.','2014-01-15') ,
 ( 'LABEL','ID_LOGIN_WITH_FACEBOOK','en','Login with Facebook!!','2014-01-15') ,
 ( 'LABEL','ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION_STEP6','en','xxx','2014-01-15') ,
 ( 'LABEL','ID_SIZE_VERY_LARGE_PERMITTED','en','The file is too large . Please upload a smaller file.','2014-10-08') ,
@@ -4048,7 +4048,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
 ( 'LABEL','ID_ROUTING_SCREEN_TEMPLATE_DOES_NOT_EXIST','en','The routing screen template with {0}: {1} does not exist.','2014-05-20') ,
 ( 'LABEL','ID_RECORD_EXISTS_IN_TABLE','en','The record "{0}" exists in table {1}.','2014-10-21') ,
 ( 'LABEL','ID_RECORD_DOES_NOT_EXIST_IN_TABLE','en','The record "{0}", does not exist in table {1}.','2014-05-20') ,
-( 'LABEL','ID_RECORD_CANNOT_BE_CREATED','en','The record couldn’t be created!','2014-10-21') ,
+( 'LABEL','ID_RECORD_CANNOT_BE_CREATED','en','The record couldn’t be created!','2014-10-21') ,
 ( 'LABEL','ID_CASE_TRACKER_OBJECT_DOES_NOT_EXIST','en','The case tracker object with {0}: {1} does not exist.','2014-05-20') ,
 ( 'LABEL','ID_ATTRIBUTE_HAS_INVALID_ELEMENT_KEY','en','The attribute {0}, has an invalid element (incorrect keys).','2014-05-20') ,
 ( 'LABEL','ID_DYNAFORM_DOES_NOT_EXIST','en','The DynaForm with {0}: {1} does not exist.','2014-05-20') ,
@@ -14907,7 +14907,7 @@ INSERT INTO ISO_LOCATION (IC_UID,IL_UID,IL_NAME,IL_NORMAL_NAME,IS_UID)  VALUES
 ('CZ','JRN','Jirny',' ','') ,
 ('CZ','JSN','Jesenik',' ','') ,
 ('CZ','JTV','JetYichov',' ','') ,
-('CZ','KAD','Kadaň',' ','') ,
+('CZ','KAD','Kadaň',' ','') ,
 ('CZ','KAP','Kaplice',' ','') ,
 ('CZ','KAR','Karlin',' ','') ,
 ('CZ','KCC','Klasterec nad Orlici',' ','') ,
@@ -14937,7 +14937,7 @@ INSERT INTO ISO_LOCATION (IC_UID,IL_UID,IL_NAME,IL_NORMAL_NAME,IS_UID)  VALUES
 ('CZ','KSL','Kostelec nad Labem',' ','') ,
 ('CZ','KST','Kostomlatky',' ','') ,
 ('CZ','KSV','Kamenicky Senov',' ','') ,
-('CZ','KTA','Košťálov',' ','') ,
+('CZ','KTA','Košťálov',' ','') ,
 ('CZ','KTV','Klatovy',' ','') ,
 ('CZ','KUH','Kutna Hora',' ','') ,
 ('CZ','KUN','Kunovice',' ','') ;
@@ -15145,7 +15145,7 @@ INSERT INTO ISO_LOCATION (IC_UID,IL_UID,IL_NAME,IL_NORMAL_NAME,IS_UID)  VALUES
 ('CZ','SUS','Susice',' ','') ,
 ('CZ','SVK','Svaty Kriz',' ','') ,
 ('CZ','SVO','Straskov',' ','') ,
-('CZ','SVR','Svrkyně',' ','') ,
+('CZ','SVR','SvrkynÄ›',' ','') ,
 ('CZ','SZA','Strazny',' ','') ,
 ('CZ','TAC','Tachov',' ','') ,
 ('CZ','TAS','Tynec nad Sazavou',' ','') ,
@@ -15180,7 +15180,7 @@ INSERT INTO ISO_LOCATION (IC_UID,IL_UID,IL_NAME,IL_NORMAL_NAME,IS_UID)  VALUES
 ('CZ','VCH','Vysoky Chlumec',' ','') ,
 ('CZ','VCR','Volduchy',' ','') ,
 ('CZ','VEA','Ceske Velenice',' ','') ,
-('CZ','VEB','Velká Bíteš',' ','') ,
+('CZ','VEB','Velká Bíteš',' ','') ,
 ('CZ','VEL','Veletov',' ','') ,
 ('CZ','VFA','Varnsdorf',' ','') ,
 ('CZ','VIM','Vimperk',' ','') ;
@@ -23197,7 +23197,7 @@ INSERT INTO ISO_LOCATION (IC_UID,IL_UID,IL_NAME,IL_NORMAL_NAME,IS_UID)  VALUES
 ('FR','FDO','Fours',' ','33') ,
 ('FR','FDS','Fondettes',' ','37') ,
 ('FR','FDU','Ferdrupt',' ','88') ,
-('FR','FEA','Ferrières-en-Gâtinais',' ','45') ,
+('FR','FEA','Ferrières-en-Gâtinais',' ','45') ,
 ('FR','FEC','Fecamp',' ','76') ,
 ('FR','FEE','Fresse',' ','70') ,
 ('FR','FEG','Fegersheim',' ','67') ,
@@ -31025,7 +31025,7 @@ INSERT INTO ISO_LOCATION (IC_UID,IL_UID,IL_NAME,IL_NORMAL_NAME,IS_UID)  VALUES
 ('HR','BVA','Brezovica',' ','') ,
 ('HR','BVO','Baska Voda',' ','') ,
 ('HR','BZA','Bozava',' ','') ,
-('HR','CAK','Čakovec',' ','') ,
+('HR','CAK','ÄŒakovec',' ','') ,
 ('HR','CRA','Crikvenica',' ','') ,
 ('HR','CRS','Cres',' ','') ,
 ('HR','CVT','Cavtat',' ','') ,
@@ -31047,8 +31047,8 @@ INSERT INTO ISO_LOCATION (IC_UID,IL_UID,IL_NAME,IL_NORMAL_NAME,IS_UID)  VALUES
 ('HR','GCN','Gorican',' ','') ,
 ('HR','GNA','Gazenica',' ','') ,
 ('HR','GOM','Gomirje',' ','') ,
-('HR','GRA','Gračac',' ','') ,
+('HR','GRA','GraÄ<EFBFBD>ac',' ','') ,
-('HR','GSP','Gospić',' ','') ,
+('HR','GSP','Gospić',' ','') ,
 ('HR','HLE','Hrvatski Leskovac',' ','') ,
 ('HR','HVA','Hvar',' ','') ,
 ('HR','ILO','Ilok',' ','') ,
@@ -31089,7 +31089,7 @@ INSERT INTO ISO_LOCATION (IC_UID,IL_UID,IL_NAME,IL_NORMAL_NAME,IS_UID)  VALUES
 ('HR','MAS','Maslenica',' ','') ,
 ('HR','MAV','Martinska Ves Desna',' ','') ,
 ('HR','MCC','Macinec',' ','') ,
-('HR','MET','Metković',' ','') ,
+('HR','MET','Metković',' ','') ,
 ('HR','MHV','Mohovo',' ','') ,
 ('HR','MIL','Milna',' ','') ,
 ('HR','MNK','Misnjak',' ','') ,
@@ -31118,7 +31118,7 @@ INSERT INTO ISO_LOCATION (IC_UID,IL_UID,IL_NAME,IL_NORMAL_NAME,IS_UID)  VALUES
 ('HR','OPT','Opatovac',' ','') ,
 ('HR','ORB','Orebic',' ','') ,
 ('HR','OSI','Osijek',' ','') ,
-('HR','OTO','Otočac',' ','') ,
+('HR','OTO','OtoÄ<EFBFBD>ac',' ','') ,
 ('HR','OVA','Orahovica',' ','') ,
 ('HR','OVC','Oriovac',' ','') ,
 ('HR','PAG','Pag',' ','') ,
@@ -31157,7 +31157,7 @@ INSERT INTO ISO_LOCATION (IC_UID,IL_UID,IL_NAME,IL_NORMAL_NAME,IS_UID)  VALUES
 ('HR','SBC','Stobrec',' ','') ,
 ('HR','SBD','Slavonski Brod',' ','') ,
 ('HR','SBR','Sobra',' ','') ,
-('HR','SDA','Satnica Đakovačka',' ','') ,
+('HR','SDA','Satnica Ä<EFBFBD>akovaÄ<EFBFBD>ka',' ','') ,
 ('HR','SDR','Sudurad',' ','') ,
 ('HR','SEN','Senj',' ','') ,
 ('HR','SGA','Strigova',' ','') ,
@@ -31344,7 +31344,7 @@ INSERT INTO ISO_LOCATION (IC_UID,IL_UID,IL_NAME,IL_NORMAL_NAME,IS_UID)  VALUES
 ('HU','HER','Hercegszanto',' ','') ,
 ('HU','HEV','Heves',' ','') ,
 ('HU','HIS','Hidasnemeti',' ','') ,
-('HU','HMV','Hódmezővásárhely',' ','') ,
+('HU','HMV','Hódmezővásárhely',' ','') ,
 ('HU','HRY','Hater',' ','') ,
 ('HU','IPO','Ipolytarnoc',' ','') ,
 ('HU','IPS','Ipolytolgyes',' ','') ,
@@ -31367,7 +31367,7 @@ INSERT INTO ISO_LOCATION (IC_UID,IL_UID,IL_NAME,IL_NORMAL_NAME,IS_UID)  VALUES
 ('HU','KIA','Kisvarda',' ','') ,
 ('HU','KIS','Kiskunfelegyhaza',' ','') ,
 ('HU','KIT','Kistarcsa',' ','') ,
-('HU','KKS','Kiskőrös',' ','') ,
+('HU','KKS','Kiskőrös',' ','') ,
 ('HU','KLK','Kistelek',' ','') ,
 ('HU','KMD','Kunmadaras',' ','') ,
 ('HU','KMJ','Kiskunmajsa',' ','') ,
@@ -37925,7 +37925,7 @@ INSERT INTO ISO_LOCATION (IC_UID,IL_UID,IL_NAME,IL_NORMAL_NAME,IS_UID)  VALUES
 ('LV','ASE','Aluksne',' ','AL') ,
 ('LV','AUC','Auce',' ','DO') ,
 ('LV','BAU','Bauska',' ','BU') ,
-('LV','BRC','Brocēni',' ','SA') ,
+('LV','BRC','Brocēni',' ','SA') ,
 ('LV','BZC','Briezuciems',' ','BL') ,
 ('LV','CES','Cesis',' ','CE') ,
 ('LV','DGP','Daugavpils',' ','DW') ,
@@ -38068,7 +38068,7 @@ INSERT INTO ISO_LOCATION (IC_UID,IL_UID,IL_NAME,IL_NORMAL_NAME,IS_UID)  VALUES
 ('MD','RIB','Ribnita',' ','') ,
 ('MD','TIR','Tiraspol',' ','') ,
 ('MD','UNG','Ungeny',' ','') ,
-('MD','VUL','Vulcăneşti',' ','') ,
+('MD','VUL','Vulcăneşti',' ','') ,
 ('ME','','',' ','') ,
 ('ME','BAR','Bar',' ','') ,
 ('ME','BIJ','Bijela',' ','') ,
@@ -38391,7 +38391,7 @@ INSERT INTO ISO_LOCATION (IC_UID,IL_UID,IL_NAME,IL_NORMAL_NAME,IS_UID)  VALUES
 ('MT','PAO','Paola',' ','') ,
 ('MT','RMI','Qormi',' ','') ,
 ('MT','SGW','San A Wann, Valletta',' ','') ,
-('MT','SJN','San Julián (St Julian)',' ','') ,
+('MT','SJN','San Julián (St Julian)',' ','') ,
 ('MT','SPB','St Paul''s Bay (San Paul il-Bahir)',' ','') ,
 ('MU','','',' ','') ,
 ('MU','CDE','Cloverdale',' ','') ,
@@ -42559,8 +42559,8 @@ INSERT INTO ISO_LOCATION (IC_UID,IL_UID,IL_NAME,IL_NORMAL_NAME,IS_UID)  VALUES
 ('PL','BAP','Biala Podlaska',' ','') ,
 ('PL','BAR','Bartoszyce',' ','') ,
 ('PL','BCA','Bochnia',' ','') ,
-('PL','BED','Będzin',' ','') ,
+('PL','BED','Będzin',' ','') ,
-('PL','BEL','Bełżyce',' ','') ,
+('PL','BEL','Bełżyce',' ','') ,
 ('PL','BGA','Boguchwala',' ','') ;
 INSERT INTO ISO_LOCATION (IC_UID,IL_UID,IL_NAME,IL_NORMAL_NAME,IS_UID)  VALUES 
 ('PL','BGW','BoguchwaBa',' ','') ,
@@ -42626,7 +42626,7 @@ INSERT INTO ISO_LOCATION (IC_UID,IL_UID,IL_NAME,IL_NORMAL_NAME,IS_UID)  VALUES
 ('PL','DKA','Debnica Kaszubska',' ','') ,
 ('PL','DNW','Dobrzyn nad Wisla',' ','') ,
 ('PL','DOK','Dobrzyniewo Koscielne',' ','') ,
-('PL','DOL','Dołuje Mierzyn',' ','') ,
+('PL','DOL','Dołuje Mierzyn',' ','') ,
 ('PL','DUS','Duszniki Zdroj',' ','') ,
 ('PL','DZE','Dobrzykowice Wroclawskie',' ','') ,
 ('PL','DZI','Dzialdowo',' ','') ,
@@ -42711,7 +42711,7 @@ INSERT INTO ISO_LOCATION (IC_UID,IL_UID,IL_NAME,IL_NORMAL_NAME,IS_UID)  VALUES
 ('PL','KAZ','Kazimierz',' ','') ,
 ('PL','KCL','Kucelinska',' ','') ,
 ('PL','KCN','Krasocin',' ','') ,
-('PL','KEK','Kędzierzyn-',' ','') ,
+('PL','KEK','Kędzierzyn-',' ','') ,
 ('PL','KEP','Kepno',' ','') ,
 ('PL','KIJ','Kijow',' ','') ,
 ('PL','KKE','Krapkowice',' ','') ,
@@ -42819,7 +42819,7 @@ INSERT INTO ISO_LOCATION (IC_UID,IL_UID,IL_NAME,IL_NORMAL_NAME,IS_UID)  VALUES
 ('PL','MIC','Miechow',' ','') ,
 ('PL','MID','Miedzyzdroje',' ','') ,
 ('PL','MIE','Michalowice',' ','') ,
-('PL','MIK','Mikołów',' ','') ,
+('PL','MIK','Mikołów',' ','') ,
 ('PL','MIN','Minsk Mazowiecki',' ','') ,
 ('PL','MIR','Mirkow',' ','') ,
 ('PL','MKI','Marki',' ','') ,
@@ -43000,7 +43000,7 @@ INSERT INTO ISO_LOCATION (IC_UID,IL_UID,IL_NAME,IL_NORMAL_NAME,IS_UID)  VALUES
 ('PL','SKP','Skopanie',' ','') ,
 ('PL','SKW','Skwierzyna',' ','') ,
 ('PL','SKZ','Skalmierzyce',' ','') ,
-('PL','SLA','Sławno',' ','') ,
+('PL','SLA','SÅ‚awno',' ','') ,
 ('PL','SLC','Slupca',' ','') ,
 ('PL','SLE','Slubice, Mazowieckie',' ','') ,
 ('PL','SLP','Slupsk',' ','') ,
@@ -43030,7 +43030,7 @@ INSERT INTO ISO_LOCATION (IC_UID,IL_UID,IL_NAME,IL_NORMAL_NAME,IS_UID)  VALUES
 ('PL','STD','Starogard',' ','') ,
 ('PL','STE','Starachowice',' ','') ,
 ('PL','STG','Starogard Gdanski',' ','') ,
-('PL','STJ','Stare Jeżewo',' ','') ,
+('PL','STJ','Stare Jeżewo',' ','') ,
 ('PL','STM','Stare Miasto',' ','') ,
 ('PL','STN','Straszyn',' ','') ,
 ('PL','STP','Stare Pole',' ','') ,
@@ -43152,7 +43152,7 @@ INSERT INTO ISO_LOCATION (IC_UID,IL_UID,IL_NAME,IL_NORMAL_NAME,IS_UID)  VALUES
 ('PL','ZGZ','Zagorz',' ','') ,
 ('PL','ZIE','Ziebice',' ','') ,
 ('PL','ZIL','Zielonka',' ','') ,
-('PL','ZKW','Żyraków',' ','') ,
+('PL','ZKW','Żyraków',' ','') ,
 ('PL','ZLA','Zolynia',' ','') ,
 ('PL','ZLO','Zlotow',' ','') ,
 ('PL','ZNI','Znin',' ','') ,
@@ -43921,7 +43921,7 @@ INSERT INTO ISO_LOCATION (IC_UID,IL_UID,IL_NAME,IL_NORMAL_NAME,IS_UID)  VALUES
 ('RO','CCA','Carcea',' ','') ,
 ('RO','CCI','Clinceni',' ','') ,
 ('RO','CCL','Caracal',' ','') ,
-('RO','CDA','Curtea de Argeș',' ','') ,
+('RO','CDA','Curtea de ArgeÈ™',' ','') ,
 ('RO','CEV','Cernavoda',' ','') ,
 ('RO','CJA','Chiajna',' ','') ,
 ('RO','CLA','Codlea',' ','') ,
@@ -43952,7 +43952,7 @@ INSERT INTO ISO_LOCATION (IC_UID,IL_UID,IL_NAME,IL_NORMAL_NAME,IS_UID)  VALUES
 ('RO','DCU','Dascalu',' ','') ,
 ('RO','DEJ','Dej',' ','') ,
 ('RO','DHO','Dorohoi',' ','') ,
-('RO','DIM','Dâmbovița',' ','') ,
+('RO','DIM','Dâmbovița',' ','') ,
 ('RO','DOR','Dornesti',' ','') ,
 ('RO','DSI','Dragasani',' ','') ,
 ('RO','DTS','Drobeta Turnu Severin',' ','') ,
@@ -44045,7 +44045,7 @@ INSERT INTO ISO_LOCATION (IC_UID,IL_UID,IL_NAME,IL_NORMAL_NAME,IS_UID)  VALUES
 ('RO','PCI','Pascani',' ','') ,
 ('RO','PDM','Poienarii de Muscel',' ','') ,
 ('RO','PEI','Petrosani',' ','') ,
-('RO','PET','Petroșani',' ','') ,
+('RO','PET','Petroșani',' ','') ,
 ('RO','PFD','Portile de Fier Doi',' ','') ,
 ('RO','PFU','Portile de Fier Unu',' ','') ,
 ('RO','PIA','Piatra Olt',' ','') ,
@@ -46708,7 +46708,7 @@ INSERT INTO ISO_LOCATION (IC_UID,IL_UID,IL_NAME,IL_NORMAL_NAME,IS_UID)  VALUES
 ('TR','MFZ','Mersin-Free Zone',' ','33') ,
 ('TR','MHM','Mahmudiye',' ','26') ,
 ('TR','MIL','Milas',' ','48') ,
-('TR','MKP','Mustafakemalpaşa',' ','16') ,
+('TR','MKP','MustafakemalpaÅŸa',' ','16') ,
 ('TR','MLK','Malkara',' ','59') ,
 ('TR','MLX','Malatya',' ','44') ,
 ('TR','MNM','Menemen',' ','35') ,
@@ -46799,7 +46799,7 @@ INSERT INTO ISO_LOCATION (IC_UID,IL_UID,IL_NAME,IL_NORMAL_NAME,IS_UID)  VALUES
 ('TR','SRG','Sarigazi',' ','34') ,
 ('TR','SRK','Sarkoy',' ','59') ,
 ('TR','SRN','Sirinevler',' ','34') ,
-('TR','SRS','Samandağ',' ','31') ,
+('TR','SRS','SamandaÄŸ',' ','31') ,
 ('TR','SRY','Sariyer',' ','34') ,
 ('TR','SSL','Susurluk',' ','10') ,
 ('TR','SSX','Samsun',' ','55') ,
@@ -59942,4 +59942,20 @@ INSERT INTO DASHLET_INSTANCE (DAS_INS_UID,DAS_UID,DAS_INS_OWNER_TYPE,DAS_INS_OWN
 ('00000000000000000000000000000004','00000000000000000000000000000004','EVERYBODY','','a:2:{s:13:"DAS_INS_TITLE";s:15:"PM Plugins News";s:7:"DAS_URL";s:71:"http://license.processmaker.com/syspmLicenseSrv/en/green/services/rssAP";}','2012-04-16 00:00:00','2012-04-16 00:00:00',1);
 
 INSERT INTO CONFIGURATION (CFG_UID,OBJ_UID,CFG_VALUE,PRO_UID,USR_UID,APP_UID) VALUES
-('ENVIRONMENT_SETTINGS','','a:1:{s:18:"directoryStructure";i:2;}','','','');
+('ENVIRONMENT_SETTINGS','','a:1:{s:18:"directoryStructure";i:2;}','','','');
+
+INSERT INTO CATALOG (CAT_UID, CAT_LABEL_ID, CAT_TYPE, CAT_FLAG, CAT_OBSERVATION, CAT_CREATE_DATE, CAT_UPDATE_DATE) VALUES
+('10','ID_BARS','GRAPHIC','','','2015-03-04','2015-03-04'),
+('20','ID_LINES','GRAPHIC','','','2015-03-04','2015-03-04'),
+('100','ID_MONTH','PERIODICITY','','','2015-03-04','2015-03-04'),
+('200','ID_QUARTER','PERIODICITY','','','2015-03-04','2015-03-04'),
+('300','ID_SEMESTER','PERIODICITY','','','2015-03-04','2015-03-04'),
+('400','ID_YEAR','PERIODICITY','','','2015-03-04','2015-03-04'),
+('1010','ID_PROCESS_EFFICIENCE','INDICATOR','','','2015-03-04','2015-03-04'),
+('1020','ID_PROCESS_INEFFICIENCE','INDICATOR','','','2015-03-04','2015-03-04'),
+('1030','ID_EMPLYEE_EFFICIENCIE','INDICATOR','','','2015-03-04','2015-03-04'),
+('1040','ID_USER_INEFFICIENCE','INDICATOR','','','2015-03-04','2015-03-04'),
+('1050','ID_OVER_DUE','INDICATOR','%','Unit for displaying','2015-03-04','2015-03-04'),
+('1060','ID_NEW_CASES','INDICATOR','','','2015-03-04','2015-03-04'),
+('1070','ID_COMPLETED_CASES','INDICATOR','','','2015-03-04','2015-03-04'),
+('1080','ID_WORKING_CASES','INDICATOR','','','2015-03-04','2015-03-04');

workflow/engine/menus/processmaker.php

@@ -1,57 +1,66 @@
-<?php
+<?php
-/**
+/**
- * processmaker.php
+ * processmaker.php
- *
+ *
- * ProcessMaker Open Source Edition
+ * ProcessMaker Open Source Edition
- * Copyright (C) 2004 - 2008 Colosa Inc.23
+ * Copyright (C) 2004 - 2008 Colosa Inc.23
- *
+ *
- * This program is free software: you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
+ * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
+ * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
+ * License, or (at your option) any later version.
- *
+ *
- * This program is distributed in the hope that it will be useful,
+ * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
+ * GNU Affero General Public License for more details.
- *
+ *
- * You should have received a copy of the GNU Affero General Public License
+ * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
+ *
- * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
+ * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
- * Coral Gables, FL, 33134, USA, or email info@colosa.com.
+ * Coral Gables, FL, 33134, USA, or email info@colosa.com.
- *
+ *
- */
+ */
-
+
-
+
-/*************************************
+/*************************************
- *  ---= Processmaker main menu=---
+ *  ---= Processmaker main menu=---
- *************************************/
+ *************************************/
-
+
-global $G_TMP_MENU;
+global $G_TMP_MENU;
-global $RBAC;
+global $RBAC;
-
+
-// HOME MODULE
+// HOME MODULE
-if ($RBAC->userCanAccess('PM_CASES') == 1) {
+if ($RBAC->userCanAccess('PM_CASES') == 1) {
-  $G_TMP_MENU->AddIdRawOption('CASES', 'cases/main', G::LoadTranslation('ID_HOME'), '', '', '', 'x-pm-home');
+  $G_TMP_MENU->AddIdRawOption('CASES', 'cases/main', G::LoadTranslation('ID_HOME'), '', '', '', 'x-pm-home');
-}
+}
-
+
-// DESIGNER MODULE
+// DESIGNER MODULE
-if ($RBAC->userCanAccess('PM_FACTORY') == 1 ) {
+if ($RBAC->userCanAccess('PM_FACTORY') == 1 ) {
-  $G_TMP_MENU->AddIdRawOption('PROCESSES', 'processes/main', G::LoadTranslation('ID_DESIGNER'), '', '', '', 'x-pm-designer');
+  $G_TMP_MENU->AddIdRawOption('PROCESSES', 'processes/main', G::LoadTranslation('ID_DESIGNER'), '', '', '', 'x-pm-designer');
-}
+}
-
+
-// DASHBOARD MODULE
+// DASHBOARD MODULE
-if ($RBAC->userCanAccess('PM_DASHBOARD') == 1) {
+if ($RBAC->userCanAccess('PM_DASHBOARD') == 1) {
-  $G_TMP_MENU->AddIdRawOption('DASHBOARD', 'dashboard/main', G::LoadTranslation('ID_DASHBOARD'), '', '', '', 'x-pm-dashboard');
+  $G_TMP_MENU->AddIdRawOption('DASHBOARD', 'dashboard/main', G::LoadTranslation('ID_DASHBOARD'), '', '', '', 'x-pm-dashboard');
-}
+}
-
+
-// ADMIN MODULE
+// ADMIN MODULE
-if ($RBAC->userCanAccess('PM_SETUP') == 1 || $RBAC->userCanAccess('PM_USERS') == 1) {
+if ($RBAC->userCanAccess('PM_SETUP') == 1 || $RBAC->userCanAccess('PM_USERS') == 1) {
-  $G_TMP_MENU->AddIdRawOption('SETUP', 'setup/main', G::LoadTranslation('ID_SETUP'), '', '', '', 'x-pm-setup');
+  $G_TMP_MENU->AddIdRawOption('SETUP', 'setup/main', G::LoadTranslation('ID_SETUP'), '', '', '', 'x-pm-setup');
-}
+}
-
+
-// PLUGINS MENUS
+/*----------------------------------********---------------------------------*/
-if( file_exists(PATH_CORE . 'menus/plugin.php') ) {
+// NEW DASHBOARD MODULE
-  require_once(PATH_CORE . 'menus/plugin.php');
+$licensedFeatures = & PMLicensedFeatures::getSingleton();
-}
+if ($licensedFeatures->verifyfeature('bvZTnIraUhCSXIxNEVOcGluVVR6Y3E3NStiMW9tWU54aU5tb0FrRnJ0MXMzLzRWMHZtakJIN3dRPT0=') && ($RBAC->userCanAccess('PM_SETUP') == 1 || $RBAC->userCanAccess('PM_USERS') == 1)) {
+    $G_TMP_MENU->AddIdRawOption('DASHBOARD+', 'strategicDashboard/main', G::LoadTranslation('ID_DASHBOARD'), '', '', '', 'x-pm-dashboard');
+}
+/*----------------------------------********---------------------------------*/
+
+// PLUGINS MENUS
+if( file_exists(PATH_CORE . 'menus/plugin.php') ) {
+  require_once(PATH_CORE . 'menus/plugin.php');
+}
+

workflow/engine/menus/setup.php

@@ -1,153 +1,160 @@
-<?php
+<?php
-/**
+/**
- * setup.php
+ * setup.php
- *
+ *
- * ProcessMaker Open Source Edition
+ * ProcessMaker Open Source Edition
- * Copyright (C) 2004 - 2008 Colosa Inc.23
+ * Copyright (C) 2004 - 2008 Colosa Inc.23
- *
+ *
- * This program is free software: you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
+ * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
+ * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
+ * License, or (at your option) any later version.
- *
+ *
- * This program is distributed in the hope that it will be useful,
+ * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
+ * GNU Affero General Public License for more details.
- *
+ *
- * You should have received a copy of the GNU Affero General Public License
+ * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
+ *
- * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
+ * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
- * Coral Gables, FL, 33134, USA, or email info@colosa.com.
+ * Coral Gables, FL, 33134, USA, or email info@colosa.com.
- *
+ *
- */
+ */
-global $G_TMP_MENU;
+global $G_TMP_MENU;
-global $RBAC;
+global $RBAC;
-$partnerFlag = (defined('PARTNER_FLAG')) ? PARTNER_FLAG : false;
+$partnerFlag = (defined('PARTNER_FLAG')) ? PARTNER_FLAG : false;
-
+
-/*----------------------------------********---------------------------------*/
+/*----------------------------------********---------------------------------*/
-$oServerConf = & serverConf::getSingleton();
+$oServerConf = & serverConf::getSingleton();
-$sAudit = $oServerConf->getAuditLogProperty( 'AL_OPTION', SYS_SYS );
+$sAudit = $oServerConf->getAuditLogProperty( 'AL_OPTION', SYS_SYS );
-$licensedFeatures = & PMLicensedFeatures::getSingleton();
+$licensedFeatures = & PMLicensedFeatures::getSingleton();
-/*----------------------------------********---------------------------------*/
+/*----------------------------------********---------------------------------*/
-
+
-if ($RBAC->userCanAccess('PM_SETUP') == 1 ) {
+if ($RBAC->userCanAccess('PM_SETUP') == 1 ) {
-    //settings options
+    //settings options
-    // $G_TMP_MENU->AddIdRawOption('LOGO', 'uplogo', G::LoadTranslation('ID_LOGO'), 'icon-pmlogo.png', '', 'settings');
+    // $G_TMP_MENU->AddIdRawOption('LOGO', 'uplogo', G::LoadTranslation('ID_LOGO'), 'icon-pmlogo.png', '', 'settings');
-    $G_TMP_MENU->AddIdRawOption('LOGO', '../admin/pmLogo', G::LoadTranslation('ID_LOGO'), 'icon-pmlogo.png','', 'settings');
+    $G_TMP_MENU->AddIdRawOption('LOGO', '../admin/pmLogo', G::LoadTranslation('ID_LOGO'), 'icon-pmlogo.png','', 'settings');
-    $G_TMP_MENU->AddIdRawOption("EMAIL_SERVER", "../emailServer/emailServer", G::LoadTranslation("ID_EMAIL_SERVER_TITLE"), "icon-email-settings1.png", "", "settings");
+    $G_TMP_MENU->AddIdRawOption("EMAIL_SERVER", "../emailServer/emailServer", G::LoadTranslation("ID_EMAIL_SERVER_TITLE"), "icon-email-settings1.png", "", "settings");
-    $G_TMP_MENU->AddIdRawOption('CALENDAR', 'calendarList', G::LoadTranslation('ID_CALENDAR'), 'icon-calendar.png', '', 'settings' );
+    $G_TMP_MENU->AddIdRawOption('CALENDAR', 'calendarList', G::LoadTranslation('ID_CALENDAR'), 'icon-calendar.png', '', 'settings' );
-    //if ($RBAC->userCanAccess('PM_SETUP_ADVANCE') == 1)
+    //if ($RBAC->userCanAccess('PM_SETUP_ADVANCE') == 1)
-    //  $G_TMP_MENU->AddIdRawOption('CASES_LIST_SETUP', '../cases/casesListSetup', G::LoadTranslation('ID_CASES_LIST_SETUP'), "",'', 'settings');
+    //  $G_TMP_MENU->AddIdRawOption('CASES_LIST_SETUP', '../cases/casesListSetup', G::LoadTranslation('ID_CASES_LIST_SETUP'), "",'', 'settings');
-    $G_TMP_MENU->AddIdRawOption('PROCESS_CATEGORY', '../processCategory/processCategoryList', G::LoadTranslation('ID_PROCESS_CATEGORY'), "rules.png",'', 'settings');
+    $G_TMP_MENU->AddIdRawOption('PROCESS_CATEGORY', '../processCategory/processCategoryList', G::LoadTranslation('ID_PROCESS_CATEGORY'), "rules.png",'', 'settings');
-}
+}
-
+
-if ($RBAC->userCanAccess('PM_SETUP_ADVANCE') == 1) {
+if ($RBAC->userCanAccess('PM_SETUP_ADVANCE') == 1) {
-    $G_TMP_MENU->AddIdRawOption('LANGUAGES', 'languages',   G::LoadTranslation('ID_LANGUAGES'), 'icon-language.png', '', 'settings');
+    $G_TMP_MENU->AddIdRawOption('LANGUAGES', 'languages',   G::LoadTranslation('ID_LANGUAGES'), 'icon-language.png', '', 'settings');
-}
+}
-
+
-if ($RBAC->userCanAccess('PM_SETUP') == 1 ) {
+if ($RBAC->userCanAccess('PM_SETUP') == 1 ) {
-    $G_TMP_MENU->AddIdRawOption('SKINS', 'skinsList', G::LoadTranslation('ID_SKINS'), 'icon-skins.png', '', 'settings');
+    $G_TMP_MENU->AddIdRawOption('SKINS', 'skinsList', G::LoadTranslation('ID_SKINS'), 'icon-skins.png', '', 'settings');
-    if (!$partnerFlag) {
+    if (!$partnerFlag) {
-        $G_TMP_MENU->AddIdRawOption('HEARTBEAT', 'processHeartBeatConfig', G::LoadTranslation('ID_HEARTBEAT_CONFIG'), "heartBeat.jpg",'', 'settings');
+        $G_TMP_MENU->AddIdRawOption('HEARTBEAT', 'processHeartBeatConfig', G::LoadTranslation('ID_HEARTBEAT_CONFIG'), "heartBeat.jpg",'', 'settings');
-    }
+    }
-
+
-    $G_TMP_MENU->AddIdRawOption('ENVIRONMENT_SETTINGS', 'environmentSettings', G::LoadTranslation('ID_ENVIRONMENT_SETTINGS'), "",'', 'settings');
+    $G_TMP_MENU->AddIdRawOption('ENVIRONMENT_SETTINGS', 'environmentSettings', G::LoadTranslation('ID_ENVIRONMENT_SETTINGS'), "",'', 'settings');
-}
+}
-
+
-if ($RBAC->userCanAccess('PM_SETUP_ADVANCE') == 1) {
+if ($RBAC->userCanAccess('PM_SETUP_ADVANCE') == 1) {
-    $G_TMP_MENU->AddIdRawOption('APPCACHEVIEW_SETUP', '../setup/appCacheViewConf', G::LoadTranslation('ID_APPCACHE_SETUP'), "",'', 'settings');
+    $G_TMP_MENU->AddIdRawOption('APPCACHEVIEW_SETUP', '../setup/appCacheViewConf', G::LoadTranslation('ID_APPCACHE_SETUP'), "",'', 'settings');
-}
+}
-
+
-if ($RBAC->userCanAccess('PM_SETUP') == 1) {
+if ($RBAC->userCanAccess('PM_SETUP') == 1) {
-    $G_TMP_MENU->AddIdRawOption('CLEAR_CACHE', 'clearCompiled', G::LoadTranslation('ID_CLEAR_CACHE'), 'icon-rebuild-clean.png', "", 'settings' );
+    $G_TMP_MENU->AddIdRawOption('CLEAR_CACHE', 'clearCompiled', G::LoadTranslation('ID_CLEAR_CACHE'), 'icon-rebuild-clean.png', "", 'settings' );
-    //$G_TMP_MENU->AddIdRawOption('ADDITIONAL_TABLES', '../additionalTables/additionalTablesList', G::LoadTranslation('ID_ADDITIONAL_TABLES'), 'icon-tables.png','', 'settings');
+    //$G_TMP_MENU->AddIdRawOption('ADDITIONAL_TABLES', '../additionalTables/additionalTablesList', G::LoadTranslation('ID_ADDITIONAL_TABLES'), 'icon-tables.png','', 'settings');
-    //$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) {
+    if (!$partnerFlag) {
-        $G_TMP_MENU->AddIdRawOption('WEBSERVICES', 'webServices', G::LoadTranslation('ID_WEB_SERVICES'), 'icon-webservices.png', '', 'settings');
+        $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');
-}
+    /*----------------------------------********---------------------------------*/
-//tools options
+
-if ($RBAC->userCanAccess('PM_SETUP_ADVANCE') == 1 ) {
+    if ($licensedFeatures->verifyfeature('bvZTnIraUhCSXIxNEVOcGluVVR6Y3E3NStiMW9tWU54aU5tb0FrRnJ0MXMzLzRWMHZtakJIN3dRPT0=')) {
-    if (!$partnerFlag) {
+        $G_TMP_MENU->AddIdRawOption('NEW_DASHBOARD', '../strategicDashboard/dashboardList', ucfirst(G::LoadTranslation('ID_STRATEGIC_DASHBOARD')), '', '', 'settings');
-        $G_TMP_MENU->AddIdRawOption('PLUGINS',   'pluginsMain', G::LoadTranslation('ID_PLUGINS_MANAGER'), 'icon-plugins.png', '', 'plugins');
+    }
-    }
+
-}
+    /*----------------------------------********---------------------------------*/
-
+
-//users options
+}
-if ($RBAC->userCanAccess('PM_USERS') == 1) {
+//tools options
-    $G_TMP_MENU->AddIdRawOption('USERS', '../users/users_List', G::LoadTranslation('ID_USERS_LIST'), 'icon-webservices.png', '', 'users');
+if ($RBAC->userCanAccess('PM_SETUP_ADVANCE') == 1 ) {
-
+    if (!$partnerFlag) {
-    $G_TMP_MENU->AddIdRawOption('GROUPS', '../groups/groups', G::LoadTranslation('ID_GROUPS'), '', '', 'users');
+        $G_TMP_MENU->AddIdRawOption('PLUGINS',   'pluginsMain', G::LoadTranslation('ID_PLUGINS_MANAGER'), 'icon-plugins.png', '', 'plugins');
-    $G_TMP_MENU->AddIdRawOption('DEPARTAMENTS', '../departments/departments', G::LoadTranslation('ID_DEPARTMENTS_USERS'), '', '', 'users');
+    }
-    $G_TMP_MENU->AddIdRawOption('ROLES', '../roles/roles_List', G::LoadTranslation('ID_ROLES'), '', '', 'users');
+}
-}
+
-
+//users options
-if ($RBAC->userCanAccess('PM_SETUP_ADVANCE') == 1 && $RBAC->userCanAccess('PM_USERS') == 1) {
+if ($RBAC->userCanAccess('PM_USERS') == 1) {
-    $G_TMP_MENU->AddIdRawOption('AUTHSOURCES', '../authSources/authSources_List', G::LoadTranslation('ID_AUTH_SOURCES'), '', '', 'users');
+    $G_TMP_MENU->AddIdRawOption('USERS', '../users/users_List', G::LoadTranslation('ID_USERS_LIST'), 'icon-webservices.png', '', 'users');
-    $G_TMP_MENU->AddIdRawOption('UX', '../admin/uxList', G::LoadTranslation('ID_USER_EXPERIENCE'), '', '', 'users');
+
-    $G_TMP_MENU->AddIdRawOption('SYSTEM', '../admin/system', G::LoadTranslation('ID_SYSTEM'), '', '', 'settings');
+    $G_TMP_MENU->AddIdRawOption('GROUPS', '../groups/groups', G::LoadTranslation('ID_GROUPS'), '', '', 'users');
-    $G_TMP_MENU->AddIdRawOption('INFORMATION', '../setup/systemInfo?option=processInfo', G::LoadTranslation('ID_SYSTEM_INFO'), '', '', 'settings');
+    $G_TMP_MENU->AddIdRawOption('DEPARTAMENTS', '../departments/departments', G::LoadTranslation('ID_DEPARTMENTS_USERS'), '', '', 'users');
-}
+    $G_TMP_MENU->AddIdRawOption('ROLES', '../roles/roles_List', G::LoadTranslation('ID_ROLES'), '', '', 'users');
-
+}
-if ($RBAC->userCanAccess('PM_SETUP') == 1) {
+
-    $G_TMP_MENU->AddIdRawOption('EVENT', '../events/eventList', G::LoadTranslation('ID_EVENTS'), '', '', 'logs');
+if ($RBAC->userCanAccess('PM_SETUP_ADVANCE') == 1 && $RBAC->userCanAccess('PM_USERS') == 1) {
-    $G_TMP_MENU->AddIdRawOption('LOG_CASE_SCHEDULER', '../cases/cases_Scheduler_Log', G::LoadTranslation('ID_CASE_SCHEDULER'), "icon-logs-list.png",'', 'logs');
+    $G_TMP_MENU->AddIdRawOption('AUTHSOURCES', '../authSources/authSources_List', G::LoadTranslation('ID_AUTH_SOURCES'), '', '', 'users');
-    $G_TMP_MENU->AddIdRawOption("CRON", "../setup/cron", G::LoadTranslation("ID_CRON_ACTIONS"), null, null, "logs");
+    $G_TMP_MENU->AddIdRawOption('UX', '../admin/uxList', G::LoadTranslation('ID_USER_EXPERIENCE'), '', '', 'users');
-    $G_TMP_MENU->AddIdRawOption('EMAILS', '../mails/emailList', ucfirst (strtolower ( G::LoadTranslation('ID_EMAILS'))), '', '', 'logs');
+    $G_TMP_MENU->AddIdRawOption('SYSTEM', '../admin/system', G::LoadTranslation('ID_SYSTEM'), '', '', 'settings');
-    /*----------------------------------********---------------------------------*/
+    $G_TMP_MENU->AddIdRawOption('INFORMATION', '../setup/systemInfo?option=processInfo', G::LoadTranslation('ID_SYSTEM_INFO'), '', '', 'settings');
-    if (isset($sAudit) && $sAudit != false && $licensedFeatures->verifyfeature('vtSeHNhT0JnSmo1bTluUVlTYUxUbUFSVStEeXVqc1pEUG5EeXc0MGd2Q3ErYz0=')) {
+}
-        $G_TMP_MENU->AddIdRawOption('AUDIT_LOG', '../setup/auditLog', ucfirst (G::LoadTranslation('ID_AUDITLOG_DISPLAY')), '', '', 'logs');
+
-    }
+if ($RBAC->userCanAccess('PM_SETUP') == 1) {
-    /*----------------------------------********---------------------------------*/
+    $G_TMP_MENU->AddIdRawOption('EVENT', '../events/eventList', G::LoadTranslation('ID_EVENTS'), '', '', 'logs');
-}
+    $G_TMP_MENU->AddIdRawOption('LOG_CASE_SCHEDULER', '../cases/cases_Scheduler_Log', G::LoadTranslation('ID_CASE_SCHEDULER'), "icon-logs-list.png",'', 'logs');
-
+    $G_TMP_MENU->AddIdRawOption("CRON", "../setup/cron", G::LoadTranslation("ID_CRON_ACTIONS"), null, null, "logs");
-if ($RBAC->userCanAccess("PM_SETUP") == 1) {
+    $G_TMP_MENU->AddIdRawOption('EMAILS', '../mails/emailList', ucfirst (strtolower ( G::LoadTranslation('ID_EMAILS'))), '', '', 'logs');
-    $G_TMP_MENU->AddIdRawOption("PM_REQUIREMENTS", "../setup/systemInfo", G::LoadTranslation("ID_PROCESSMAKER_REQUIREMENTS_CHECK"), "", "", "settings");
+    /*----------------------------------********---------------------------------*/
-    $G_TMP_MENU->AddIdRawOption("PHP_INFO", "../setup/systemInfo?option=php", G::LoadTranslation("ID_PHP_INFO"), "", "", "settings");
+    if (isset($sAudit) && $sAudit != false && $licensedFeatures->verifyfeature('vtSeHNhT0JnSmo1bTluUVlTYUxUbUFSVStEeXVqc1pEUG5EeXc0MGd2Q3ErYz0=')) {
-    //$G_TMP_MENU->AddIdRawOption("PHP_MAINTENANCE", "../admin/maintenance", 'Maintenance', "", "", "settings");
+        $G_TMP_MENU->AddIdRawOption('AUDIT_LOG', '../setup/auditLog', ucfirst (G::LoadTranslation('ID_AUDITLOG_DISPLAY')), '', '', 'logs');
-    /*----------------------------------********---------------------------------*/
+    }
-    if ($licensedFeatures->verifyfeature('vtSeHNhT0JnSmo1bTluUVlTYUxUbUFSVStEeXVqc1pEUG5EeXc0MGd2Q3ErYz0=')) {
+    /*----------------------------------********---------------------------------*/
-        $G_TMP_MENU->AddIdRawOption("AUDIT_LOG", "auditLogConfig", G::LoadTranslation("ID_AUDITLOG_DISPLAY"), "", "", "settings");
+}
-    }
+
-    /*----------------------------------********---------------------------------*/
+if ($RBAC->userCanAccess("PM_SETUP") == 1) {
-}
+    $G_TMP_MENU->AddIdRawOption("PM_REQUIREMENTS", "../setup/systemInfo", G::LoadTranslation("ID_PROCESSMAKER_REQUIREMENTS_CHECK"), "", "", "settings");
-/*----------------------------------********---------------------------------*/
+    $G_TMP_MENU->AddIdRawOption("PHP_INFO", "../setup/systemInfo?option=php", G::LoadTranslation("ID_PHP_INFO"), "", "", "settings");
-require_once 'classes/class.pmLicenseManager.php';
+    //$G_TMP_MENU->AddIdRawOption("PHP_MAINTENANCE", "../admin/maintenance", 'Maintenance', "", "", "settings");
-if (!file_exists(PATH_DATA_SITE . "plugin.singleton")) {
+    /*----------------------------------********---------------------------------*/
-    require_once PATH_CORE . 'methods' . PATH_SEP . 'enterprise' . PATH_SEP . 'enterprise.php';
+    if ($licensedFeatures->verifyfeature('vtSeHNhT0JnSmo1bTluUVlTYUxUbUFSVStEeXVqc1pEUG5EeXc0MGd2Q3ErYz0=')) {
-    $enterprise = new enterprisePlugin('enterprise');
+        $G_TMP_MENU->AddIdRawOption("AUDIT_LOG", "auditLogConfig", G::LoadTranslation("ID_AUDITLOG_DISPLAY"), "", "", "settings");
-    $enterprise->enable();
+    }
-    $enterprise->setup();
+    /*----------------------------------********---------------------------------*/
-}
+}
-$pmLicenseManagerO = &pmLicenseManager::getSingleton();
+/*----------------------------------********---------------------------------*/
-$licenseStatusInfo = $pmLicenseManagerO->getCurrentLicenseStatus();
+require_once 'classes/class.pmLicenseManager.php';
-$licStatusMsg = null;
+if (!file_exists(PATH_DATA_SITE . "plugin.singleton")) {
-
+    require_once PATH_CORE . 'methods' . PATH_SEP . 'enterprise' . PATH_SEP . 'enterprise.php';
-if ((isset($pmLicenseManagerO->plan)) && ($pmLicenseManagerO->plan != "")) {
+    $enterprise = new enterprisePlugin('enterprise');
-    $lines = explode(" - ", $pmLicenseManagerO->plan);
+    $enterprise->enable();
-    if (isset($lines[0])) {
+    $enterprise->setup();
-        $licStatusMsg .= "<br><i><small>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;" . $lines[0] . "</small></i>";
+}
-    }
+$pmLicenseManagerO = &pmLicenseManager::getSingleton();
-    if ((isset($lines[1])) && ($lines[1] != $lines[0])) {
+$licenseStatusInfo = $pmLicenseManagerO->getCurrentLicenseStatus();
-        $licStatusMsg .= "<br><i><small>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;" . $lines[1] . "</small></i>";
+$licStatusMsg = null;
-    }
+
-}
+if ((isset($pmLicenseManagerO->plan)) && ($pmLicenseManagerO->plan != "")) {
-
+    $lines = explode(" - ", $pmLicenseManagerO->plan);
-if ($licenseStatusInfo["message"] != "") {
+    if (isset($lines[0])) {
-    $licStatusMsg = "&nbsp;<font color=\"red\">(" . $licenseStatusInfo["message"] . ")</font>";
+        $licStatusMsg .= "<br><i><small>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;" . $lines[0] . "</small></i>";
-}
+    }
-/*----------------------------------********---------------------------------*/
+    if ((isset($lines[1])) && ($lines[1] != $lines[0])) {
-if ($RBAC->userCanAccess("PM_SETUP") == 1) {
+        $licStatusMsg .= "<br><i><small>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;" . $lines[1] . "</small></i>";
-    /*----------------------------------********---------------------------------*/
+    }
-    $G_TMP_MENU->AddIdRawOption("PMENTERPRISE", "../enterprise/addonsStore", G::LoadTranslation('ID_MENU_NAME') . $licStatusMsg, "", "", "plugins");
+}
-    /*----------------------------------********---------------------------------*/
+
-    $G_TMP_MENU->AddIdRawOption("CASES_LIST_SETUP", "../cases/casesListSetup", G::LoadTranslation('ID_CASES_LIST'), "", "", "settings");
+if ($licenseStatusInfo["message"] != "") {
-}
+    $licStatusMsg = "&nbsp;<font color=\"red\">(" . $licenseStatusInfo["message"] . ")</font>";
-
+}
+/*----------------------------------********---------------------------------*/
+if ($RBAC->userCanAccess("PM_SETUP") == 1) {
+    /*----------------------------------********---------------------------------*/
+    $G_TMP_MENU->AddIdRawOption("PMENTERPRISE", "../enterprise/addonsStore", G::LoadTranslation('ID_MENU_NAME') . $licStatusMsg, "", "", "plugins");
+    /*----------------------------------********---------------------------------*/
+    $G_TMP_MENU->AddIdRawOption("CASES_LIST_SETUP", "../cases/casesListSetup", G::LoadTranslation('ID_CASES_LIST'), "", "", "settings");
+}

workflow/engine/src/ProcessMaker/Services/api.ini

@@ -103,3 +103,9 @@ debug = 1
 
 [alias: consolidated]
     list = "ProcessMaker\Services\Api\Consolidated"
+
+[alias: dashboard]
+    dashboard = "ProcessMaker\Services\Api\Dashboard"
+
+[alias: catalog]
+    dashboard = "ProcessMaker\Services\Api\Catalog"