fernando/luos
1
0
Fork 0
Code Releases Activity

Merge branch 'master' of bitbucket.org:colosa/processmaker into PM-2754

Browse Source
This commit is contained in:
Victor Saisa Lopez
2015-05-21 17:27:25 -04:00
parent d1390c1991 8fdcabed56
commit b8ec674aaa
10 changed files with 70 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
workflow/engine/classes/model/CalendarDefinition.php
View File

@@ -450,5 +450,14 @@ class CalendarDefinition extends BaseCalendarDefinition
$oDataset->next();
return $oDataset->getRow();
}
public function calendarName ($calendarUid)
{
$tr = CalendarDefinitionPeer::retrieveByPK( $calendarUid );
if ((is_object( $tr ) && get_class( $tr ) == 'CalendarDefinition')) {
return $tr->getCalendarName();
}
return false;
}
}

13
workflow/engine/classes/model/Users.php
View File

@@ -261,7 +261,7 @@ class Users extends BaseUsers
//Calendar
$calendar = new Calendar();
$calendarInfo = $calendar->getCalendarFor( $userUid, $userUid, $userUid );
$aFields["USR_CALENDAR"] = ($calendarInfo["CALENDAR_APPLIED"] != "DEFAULT") ? $calendarInfo["CALENDAR_UID"] : "";
$aFields["USR_CALENDAR"] = ($calendarInfo["CALENDAR_APPLIED"] != "DEFAULT") ? $calendarInfo["CALENDAR_UID"] : "";
//Photo
$pathPhoto = PATH_IMAGES_ENVIRONMENT_USERS . $userUid . ".gif";
@@ -287,10 +287,21 @@ class Users extends BaseUsers
$arrayData["birthday"] = $aFields["USR_BIRTHDAY"];
$arrayData["position"] = $aFields["USR_POSITION"];
$arrayData["replacedby"] = $aFields["USR_REPLACED_BY"];
if(strlen($arrayData["replacedby"] != 0)){
$oUser = UsersPeer::retrieveByPK( $arrayData["replacedby"] );
$arrayData["replacedbyfullname"] = $oUser->getUsrFirstname() . ' ' . $oUser->getUsrLastname();
}
$arrayData["duedate"] = $aFields["USR_DUE_DATE"];
$arrayData["calendar"] = $aFields["USR_CALENDAR"];
if(strlen($aFields["USR_CALENDAR"] != 0)){
$arrayData["calendarname"] = $calendar->calendarName( $aFields["USR_CALENDAR"] );
}
$arrayData["status"] = $aFields["USR_STATUS"];
$arrayData["department"] = $aFields["DEP_UID"];
if (strlen($arrayData["department"]) != 0) {
$oDepart = DepartmentPeer::retrieveByPk( $arrayData["department"] );
$arrayData["departmentname"] = $oDepart->getDepTitle();
}
$arrayData["reportsto"] = $aFields["USR_REPORTS_TO"];
$arrayData["userexperience"] = $aFields["USR_UX"];
$arrayData["photo"] = $pathPhoto;

12
workflow/engine/methods/processes/processes_Delete.php
View File

@@ -42,9 +42,15 @@ if ($access != 1) {
//$oProcessMap = new ProcessMap();
$uids = explode(',', $_POST['PRO_UIDS']);
try {
foreach ($uids as $uid) {
//Add Audit Log
$oProcess = new Process();
$process=$oProcess->load($uid);
$nameProcess=$process['PRO_TITLE'];
G::auditLog("DeleteProcess", $nameProcess. ' ('.$uid.')' .' Deleted');
try {
foreach ($uids as $uid) {
//$oProcessMap->deleteProcess($uid);
ProcessMaker\Project\Workflow::removeIfExists($uid);
ProcessMaker\Project\Bpmn::removeIfExists($uid);
@@ -53,7 +59,7 @@ try {
$resp = new StdClass();
$resp->status = 0;
$resp->msg = 'All process was deleted successfully';
echo G::json_encode($resp);
} catch (Exception $e) {

13
workflow/engine/methods/processes/processes_Import_Ajax.php
View File

@@ -225,7 +225,7 @@ if ($action == "uploadFileNewProcess") {
//1 -exist process
$result->ExistGroupsInDatabase = ""; //"" -Default
//0 -Dont exist process
//1 -exist process
//1 -exist process
$optionGroupExistInDatabase = isset( $_REQUEST["optionGroupExistInDatabase"] ) ? $_REQUEST["optionGroupExistInDatabase"] : null;
//!Upload file
@@ -254,8 +254,8 @@ if ($action == "uploadFileNewProcess") {
//if file is a .pm file continues normally the importing
if ($processFileType == "pm") {
$oData = $oProcess->getProcessData( $path . $filename );
}
}
$importer->throwExceptionIfExistsReservedWordsSql($oData);
//!Upload file
@@ -303,6 +303,13 @@ if ($action == "uploadFileNewProcess") {
//!data ouput
$result->sNewProUid = $sProUid;
$result->proFileName = $Fields['PRO_FILENAME'];
//Add Audit Log
$ogetProcess = new Process();
$getprocess=$ogetProcess->load($oData->process['PRO_UID']);
$nameProcess=$getprocess['PRO_TITLE'];
G::auditLog("ImportProcess", 'PM File Imported '.$nameProcess. ' ('.$oData->process['PRO_UID'].')');
} catch (Exception $e) {
$result->response = $e->getMessage();
$result->catchMessage = $e->getMessage();

4
workflow/engine/methods/setup/auditLog.php
View File

@@ -150,7 +150,9 @@ $arrayAction = array(
"AssignUserTask" => G::LoadTranslation("ID_ASSIGN_USER_TASK"),
"AssignGroupTask" => G::LoadTranslation("ID_ASSIGN_GROUP_TASK"),
"DeleteUserTask" => G::LoadTranslation("ID_DELETE_USER_TASK"),
"DeleteGroupTask" => G::LoadTranslation("ID_DELETE_GROUP_TASK")
"DeleteGroupTask" => G::LoadTranslation("ID_DELETE_GROUP_TASK"),
"ImportProcess" => G::LoadTranslation("ID_IMPORT_PROCESS"),
"DeleteProcess" => G::LoadTranslation("ID_DELETE_PROCESS")
);
asort($arrayAction);

6
workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php
View File

@@ -77,6 +77,12 @@ class BpmnWorkflow extends Project\Bpmn
$this->wp = new Project\Workflow();
$this->wp->create($wpData);
//Add Audit Log
$ogetProcess = new \Process();
$getprocess=$ogetProcess->load($this->getUid());
$nameProcess=$getprocess['PRO_TITLE'];
\G::auditLog("ImportProcess", 'PMX File Imported '.$nameProcess. ' ('.$this->getUid().')');
} catch (\Exception $e) {
$prjUid = $this->getUid();
//$this->remove();

7
workflow/engine/src/ProcessMaker/Project/Adapter/WorkflowBpmn.php
View File

@@ -64,6 +64,13 @@ class WorkflowBpmn extends Project\Workflow
// At this time we will add a default diagram and process
$this->bp->addDiagram();
$this->bp->addProcess();
//Add Audit Log
$ogetProcess = new \Process();
$getprocess=$ogetProcess->load($this->getUid());
$nameProcess=$getprocess['PRO_TITLE'];
\G::auditLog("ImportProcess", 'BPMN Imported '.$nameProcess. ' ('.$this->getUid().')');
} catch (\Exception $e) {
$prjUid = $this->getUid();
$this->remove();

25
workflow/engine/templates/processCategory/processCategoryList.js
View File

@@ -120,19 +120,6 @@ Ext.onReady(function(){
handler: GridByDefault
});
newForm = new Ext.FormPanel({
url: 'processCategory_Ajax?action=saveNewCategory',
frame: true,
items:[
{xtype: 'textfield', fieldLabel: _('ID_CATEGORY_NAME'), name: 'category', width: 250, maxLength :100, allowBlank: false}
],
buttons: [
{text: _('ID_SAVE'), handler: SaveNewCategory},
{text: _('ID_CANCEL'), handler: CloseWindow}
]
});
editForm = new Ext.FormPanel({
url: 'processCategory_Ajax?action=updateCategory',
frame: true,
@@ -297,6 +284,18 @@ DoNothing = function(){};
//Open New Category Form
NewCategoryWindow = function(){
newForm = new Ext.FormPanel({
url: 'processCategory_Ajax?action=saveNewCategory',
frame: true,
items: [
{xtype: 'textfield', fieldLabel: _('ID_CATEGORY_NAME'), name: 'category', width: 250, maxLength :100, allowBlank: false}
],
buttons: [
{text: _('ID_SAVE'), handler: SaveNewCategory},
{text: _('ID_CANCEL'), handler: CloseWindow}
]
});
newForm.getForm().reset();
newForm.getForm().items.items[0].focus('',500);
w = new Ext.Window({

2
workflow/engine/xmlform/dynaforms/fields/text.xml
View File

@@ -31,7 +31,7 @@
<en><![CDATA[Mask]]></en>
</PME_MASK>
<PME_STRTO type="dropdown" defaultvalue="">
<en><![CDATA[Text transform to]]><option name=""><![CDATA[]]></option><option name="UPPER"><![CDATA[UPPER]]></option><option name="LOWER"><![CDATA[LOWER]]></option><option name="PHRASE"><![CDATA[CAPITALIZE PHRASE]]></option><option name="TITLE"><![CDATA[TITLE CASE]]></option></en>
<en><![CDATA[Text transform to]]><option name=""><![CDATA[]]></option><option name="UPPER"><![CDATA[UPPER]]></option><option name="LOWER"><![CDATA[lower]]></option><option name="TITLE"><![CDATA[Capitalize Phrase]]></option><option name="PHRASE"><![CDATA[Title case]]></option></en>
</PME_STRTO>
<PME_REQUIRED type="checkbox" falseValue="0" value="1" defaultvalue="0" labelOnRight="0">
<en><![CDATA[Required]]></en>

2
workflow/engine/xmlform/processes/processes_FilesOptions.xml
View File

@@ -59,7 +59,7 @@ var showPromptLogin = function(lastAction, pro_uid, fileName, fc64) {
width:'75%',
marginTop:3,
backgroundColor:'white',
border:'1px solid #919B9C',
border:'1px solid #919B9C'
});
label.appendChild(theUser);
label.innerHTML = (_('ID_USERNAME')) + ': ';