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

Merged in dheeyi/processmaker/PM-1472A (pull request #1508)

Browse Source 
PM-1472 16565: Red background graphic for error messages needs to be taller to see the text clearly
This commit is contained in:
Julio Cesar Laura Avendaño
2015-02-20 16:31:51 -04:00
parent 5d79aa0d46 1779e3751d
commit 22a0c77eaf
11 changed files with 77 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
workflow/engine/methods/processes/processes_Ajax.php
View File

@@ -116,7 +116,10 @@ try {
$infoProcess = new Processes();
$resultProcess = $infoProcess->getProcessRow($proUid);
}
if($proUid != "") {
$valuesProcess['PRO_UID'] = $proUid;
$valuesProcess['PRO_UPDATE_DATE'] = date("Y-m-d H:m:i");
}
if(isset($proUid) && $proUid != "") {
$valuesProcess['PRO_UID'] = $proUid;
$valuesProcess['PRO_UPDATE_DATE'] = date("Y-m-d H:i:s");
@@ -269,6 +272,10 @@ try {
G::auditLog('SaveTaskPosition','Change task position ('.$oTask->getTasTitle().') in process "'.$resultProcess['PRO_TITLE'].'"');
break;
case 'deleteTask':
$oTaskNewPattern = new Task();
$taskInfo=$oTaskNewPattern->load($oData->tas_uid);
$titleTask=$taskInfo['TAS_TITLE'];
G::auditlog("DeleteTask",'Delete Task -> '.$titleTask.' : '.$oData->tas_uid);
$sOutput = $oProcessMap->deleteTask($oData->tas_uid);
break;
case 'addGuide':
@@ -477,6 +484,10 @@ try {
break;
case 'deleteAllRoutes':
G::LoadClass('tasks');
$oTaskNewPattern = new Task();
$taskInfo=$oTaskNewPattern->load($oData->tas_uid);
$titleTask=$taskInfo['TAS_TITLE'];
G::auditlog("DeleteRoutes",'Delete All Routes From Task -> '.$titleTask.' : '.$oData->tas_uid);
$oTasks = new Tasks();
$oTasks->deleteAllRoutesOfTask($oData->pro_uid, $oData->tas_uid);
break;
@@ -516,7 +527,11 @@ try {
$oProcessMap->downloadFile($oData->pro_uid, $oData->main_directory, $oData->directory, $oData->file);
break;
case 'deleteSubProcess':
$sOutput = $oProcessMap->deleteSubProcess($oData->pro_uid, $oData->tas_uid);
$oTaskNewPattern = new Task();
$taskInfo=$oTaskNewPattern->load($oData->tas_uid);
$titleTask=$taskInfo['TAS_TITLE'];
G::auditlog("DeleteSubProcess",'Delete Sub-Process -> '.$titleTask.' : '.$oData->tas_uid);
$sOutput = $oProcessMap->deleteSubPrcocess($oData->pro_uid, $oData->tas_uid);
break;
case 'subProcess_Properties':
$oProcessMap->subProcess_Properties($oData->pro_uid, $oData->tas_uid, $oData->index);

1
workflow/engine/methods/steps/conditions_Save.php
View File

@@ -43,6 +43,7 @@ try {
$value = $_POST;
$oStep->update( array ('STEP_UID' => $value['STEP_UID'],'STEP_CONDITION' => $value['STEP_CONDITION']
) );
G::auditlog("NewConditionFromStep","Save Condition From Step -> ".$value['STEP_UID'].' In Task -> '.$value['TAS_UID'].' Condition -> '.$value['STEP_CONDITION']);
G::LoadClass( 'processMap' );
$oProcessMap = new ProcessMap();
$oProcessMap->getStepsCriteria( $value['TAS_UID'] );

4
workflow/engine/methods/steps/steps_Ajax.php
View File

@@ -118,6 +118,7 @@ try {
}
break;
case 'assignTrigger':
G::auditlog("AssignTrigger","Assign Trigger to a Step -> ".$aData['STEP_UID'].' In Task -> '.$_SESSION['TASK'].' Trigger Type -> '.$aData['ST_TYPE'].' Condition -> '.$aData['ST_CONDITION'].' Trigger UID -> '.$aData['TRI_UID']);
$aFields = array (
'STEP_UID' => $aData['STEP_UID'],
'TAS_UID' => $_SESSION['TASK'],
@@ -159,15 +160,18 @@ try {
break;
case 'upTrigger':
$aData['iPosition'] = (int) $aData['iPosition'];
G::auditlog("UpTrigger","Up the Trigger One Level -> ".$aData['sStep'].' In Task -> '.$_SESSION['TASK'].' Trigger Type -> '.$aData['sType'].' Trigger Position -> '.$aData['iPosition'].' Trigger UID -> '.$aData['sTrigger']);
$oStepTrigger = new StepTrigger();
$oStepTrigger->up( $aData['sStep'], $_SESSION['TASK'], $aData['sTrigger'], $aData['sType'], $aData['iPosition'] );
break;
case 'downTrigger':
$aData['iPosition'] = (int) $aData['iPosition'];
G::auditlog("DownTrigger","Down the Trigger One Level -> ".$aData['sStep'].' In Task -> '.$_SESSION['TASK'].' Trigger Type -> '.$aData['sType'].' Trigger Position -> '.$aData['iPosition'].' Trigger UID -> '.$aData['sTrigger']);
$oStepTrigger = new StepTrigger();
$oStepTrigger->down( $aData['sStep'], $_SESSION['TASK'], $aData['sTrigger'], $aData['sType'], $aData['iPosition'] );
break;
case 'ofToAssignTrigger':
G::auditlog("DeleteTrigger","Delete Trigger from a Step -> ".$aData['sStep'].' In Task -> '.$_SESSION['TASK'].' Trigger Type -> '.$aData['sType'].' Trigger Position -> '.$aData['iPosition'].' Trigger UID -> '.$aData['sTrigger']);
$oStepTrigger = new StepTrigger();
$oStepTrigger->reOrder( $aData['sStep'], $_SESSION['TASK'], $aData['sType'], $aData['iPosition'] );
$oStepTrigger->remove( $aData['sStep'], $_SESSION['TASK'], $aData['sTrigger'], $aData['sType'] );

1
workflow/engine/methods/steps/steps_Delete.php
View File

@@ -39,6 +39,7 @@ try {
$oStep = new Step();
$oStep->reOrder( $_POST['STEP_UID'], $_POST['STEP_POSITION'] );
$oStep->remove( $_POST['STEP_UID'] );
G::auditlog("StepDelete","Step Deleted -> ".$_POST['STEP_UID'].' In Task -> '.$_POST['TASK'].' Step Position -> '.$_POST['STEP_POSITION']);
G::LoadClass( 'processMap' );
$oProcessMap = new ProcessMap();
$oProcessMap->getStepsCriteria( $_POST['TASK'] );

2
workflow/engine/methods/steps/steps_Down.php
View File

@@ -38,10 +38,10 @@ try {
require_once 'classes/model/Step.php';
$oStep = new Step();
$oStep->down( $_POST['STEP_UID'], $_POST['TASK'], $_POST['STEP_POSITION'] );
G::auditlog("StepDown","Down the Step One Level -> ".$_POST['STEP_UID'].' In Task -> '.$_POST['TASK'].' Step Position -> '.$_POST['STEP_POSITION']);
G::LoadClass( 'processMap' );
$oProcessMap = new ProcessMap();
$oProcessMap->getStepsCriteria( $_POST['TASK'] );
} catch (Exception $oException) {
die( $oException->getMessage() );
}

1
workflow/engine/methods/steps/steps_Save.php
View File

@@ -41,6 +41,7 @@ try {
) );
$oStep->update( array ('STEP_UID' => $sStepUID,'STEP_TYPE_OBJ' => $_POST['sType'],'STEP_UID_OBJ' => $_POST['sUID'],'STEP_POSITION' => ($oStep->getNextPosition( $_POST['sTask'] ) - 1),'STEP_MODE' => (isset( $_POST['sMode'] )) ? $_POST['sMode'] : 'EDIT'
) );
G::auditlog("SaveNewStep","Save New Step -> ".$_POST['sUID'].' In Task -> '.$_POST['sTask'].' Type Step -> '.$_POST['sType']);
G::LoadClass( 'processMap' );
$oProcessMap = new ProcessMap();
$oProcessMap->getStepsCriteria( $_POST['sTask'] );

2
workflow/engine/methods/steps/steps_Up.php
View File

@@ -38,10 +38,10 @@ try {
require_once 'classes/model/Step.php';
$oStep = new Step();
$oStep->up( $_POST['STEP_UID'], $_POST['TASK'], $_POST['STEP_POSITION'] );
G::auditlog("OptionsMenuTask","Up the Step One Level -> ".$_POST['STEP_UID'].' In Task -> '.$_POST['TASK'].' Step Position -> '.$_POST['STEP_POSITION']);
G::LoadClass( 'processMap' );
$oProcessMap = new ProcessMap();
$oProcessMap->getStepsCriteria( $_POST['TASK'] );
} catch (Exception $oException) {
die( $oException->getMessage() );
}

1
workflow/engine/methods/tasks/tasks_Ajax.php
View File

@@ -35,7 +35,6 @@ try {
switch ($sAction) {
case "saveTaskData":
require_once ("classes/model/Task.php");
$response = array ();
$oTask = new Task();

4
workflow/engine/methods/users/users_Ajax.php
View File

@@ -86,9 +86,11 @@ try {
switch ((int) $_POST['TU_RELATION']) {
case 1:
echo $oTasks->assignUser($_POST['TAS_UID'], $_POST['USR_UID'], $_POST['TU_TYPE']);
G::auditlog("AssignUserTask","Assign a User to a Task -> ".$_POST['TAS_UID'].' User UID -> '.$_POST['USR_UID']);
break;
case 2:
echo $oTasks->assignGroup($_POST['TAS_UID'], $_POST['USR_UID'], $_POST['TU_TYPE']);
G::auditlog("AssignGroupTask","Assign a Group to a Task -> ".$_POST['TAS_UID'].' User UID -> '.$_POST['USR_UID']);
break;
}
break;
@@ -98,9 +100,11 @@ try {
switch ((int) $_POST['TU_RELATION']) {
case 1:
echo $oTasks->ofToAssignUser($_POST['TAS_UID'], $_POST['USR_UID'], $_POST['TU_TYPE']);
G::auditlog("DeleteUserTask"," Delete a User from a Task -> ".$_POST['TAS_UID'].' User UID -> '.$_POST['USR_UID']);
break;
case 2:
echo $oTasks->ofToAssignGroup($_POST['TAS_UID'], $_POST['USR_UID'], $_POST['TU_TYPE']);
G::auditlog("DeleteGroupTask","Delete a Group from a Task -> ".$_POST['TAS_UID'].' User UID -> '.$_POST['USR_UID']);
break;
}
break;

38
workflow/engine/skinEngine/base/css/style.css
View File

@@ -68,26 +68,30 @@ img {
padding:0 20px;
vertical-align:middle;
font-weight: bold;
transition:2s all;
-webkit-transition:2s all;
-moz-transition:2s all;
-o-transition:2s all;
-ms-transition:2s all;
}
@media screen and (max-width: 768px) {
@media screen and (max-width: 1680px) {
#temporalMessageTD {
border-width: 0px;
font-size: normal 6pt !important;
height: 25px !important;
padding: 0 3px !important;
background-size: 100% 100% !important;
}
}
@media screen\0 {
#temporalMessageTD {
border-width: 0px;
font: normal 8pt "Open Sans", Tahoma, sans-serif, MiscFixed;
background-size: 100% 100%;
}
}
@media screen and (max-width: 600px) {
.temporalMessageERROR {
border-width: 0px;
font: normal 6pt "Open Sans", Tahoma, sans-serif, MiscFixed;
text-decoration: none;
height: 31px;
padding: 0 2px;
vertical-align: middle;
font-weight: bold;
transition:2s all;
-webkit-transition:2s all;
-moz-transition:2s all;
-o-transition:2s all;
-ms-transition:2s all;
font-size: normal 6pt !important;
height: 25px !important;
padding: 0 2px !important;
background-size: 100% 100% !important;
}
}
.temporalMessageWARNING

38
workflow/engine/skinEngine/neoclassic/css/style.css
View File

@@ -244,26 +244,30 @@ img {
padding: 0 20px;
vertical-align: middle;
font-weight: bold;
transition:2s all;
-webkit-transition:2s all;
-moz-transition:2s all;
-o-transition:2s all;
-ms-transition:2s all;
}
@media screen and (max-width: 768px) {
@media screen and (max-width: 1680px) {
#temporalMessageTD {
border-width: 0px;
font-size: normal 6pt !important;
height: 25px !important;
padding: 0 3px !important;
background-size: 100% 100% !important;
}
}
@media screen\0 {
#temporalMessageTD {
border-width: 0px;
font: normal 8pt "Open Sans", Tahoma, sans-serif, MiscFixed;
background-size: 100% 100%;
}
}
@media screen and (max-width: 600px) {
.temporalMessageERROR {
border-width: 0px;
font: normal 6pt "Open Sans", Tahoma, sans-serif, MiscFixed;
text-decoration: none;
height: 31px;
padding: 0 2px;
vertical-align: middle;
font-weight: bold;
transition:2s all;
-webkit-transition:2s all;
-moz-transition:2s all;
-o-transition:2s all;
-ms-transition:2s all;
font-size: normal 6pt !important;
height: 25px !important;
padding: 0 2px !important;
background-size: 100% 100% !important;
}
}
.temporalMessageWARNING {