Merge remote branch 'upstream/master'
This commit is contained in:
Richard Yujra
@@ -76,7 +76,6 @@ Scenario Outline: Create news pmtable
|
||||
Examples:
|
||||
|
||||
| test_description | pmt_uid_number | pmt_tab_name | pmt_tab_dsc | fld_name_1 | fld_label_1 | fld_type_1 | fld_name_2 | fld_label_2 | fld_type_2 | fld_name_3 | fld_label_3 | fld_type_3 |
|
||||
| Create pmtable with type varchar, bigint and boolean | 1 | PMT_Test_QA1 | pmt table 1 created with script | UNO | UNO | VARCHAR | DOS | DOS | BIGINT | TRES | TRES | BOOLEAN |
|
||||
| Create pmtable with type varchar, datetime and decimal | 3 | PMT_Test_QA3 | pmt table 3 created with script | UNO | UNO | VARCHAR | DOS | DOS | DATETIME | TRES | TRES | DECIMAL |
|
||||
| Create pmtable with type varchar, double and float | 4 | PMT_Test_QA4 | pmt table 4 created with script | UNO | UNO | VARCHAR | DOS | DOS | DOUBLE | TRES | TRES | FLOAT |
|
||||
| Create pmtable with type varchar, integer and longvarchar | 5 | PMT_Test_QA5 | pmt table 5 created with script | UNO | UNO | VARCHAR | DOS | DOS | INTEGER | TRES | TRES | LONGVARCHAR |
|
||||
@@ -111,7 +110,66 @@ Scenario Outline: Create new pmtable with type date and char
|
||||
|
||||
| test_description | pmt_uid_number |
|
||||
| Create pmtable with type date | 2 |
|
||||
|
||||
|
||||
Scenario Outline: Create new pmtable with type bigint
|
||||
Given POST this data:
|
||||
"""
|
||||
{
|
||||
"pmt_tab_name" : "PMT_Test_QA1",
|
||||
"pmt_tab_dsc" : "pmt table 1 created with script",
|
||||
"fields" : [
|
||||
{
|
||||
"fld_key" : 1,
|
||||
"fld_name" : "EJEMPLOA",
|
||||
"fld_label" : "EJEMPLOA",
|
||||
"fld_type" : "BIGINT"
|
||||
}
|
||||
]
|
||||
}
|
||||
"""
|
||||
And I request "pmtable"
|
||||
Then the response status code should be 201
|
||||
And the response charset is "UTF-8"
|
||||
And the content type is "application/json"
|
||||
And the type is "object"
|
||||
And store "pmt_uid" in session array as variable "pmt_uid_<pmt_uid_number>"
|
||||
|
||||
Examples:
|
||||
|
||||
| test_description | pmt_uid_number |
|
||||
| Create pmtable with type date | 1 |
|
||||
|
||||
|
||||
Scenario Outline: Create new pmtable with type boolean
|
||||
Given POST this data:
|
||||
"""
|
||||
{
|
||||
"pmt_tab_name" : "PMT_Test_QA8",
|
||||
"pmt_tab_dsc" : "pmt table 1 created with script",
|
||||
"fields" : [
|
||||
{
|
||||
"fld_key" : 1,
|
||||
"fld_name" : "EJEMPLOB",
|
||||
"fld_label" : "EJEMPLOB",
|
||||
"fld_type" : "BOOLEAN"
|
||||
}
|
||||
]
|
||||
}
|
||||
"""
|
||||
And I request "pmtable"
|
||||
Then the response status code should be 201
|
||||
And the response charset is "UTF-8"
|
||||
And the content type is "application/json"
|
||||
And the type is "object"
|
||||
And store "pmt_uid" in session array as variable "pmt_uid_<pmt_uid_number>"
|
||||
|
||||
Examples:
|
||||
|
||||
| test_description | pmt_uid_number |
|
||||
| Create pmtable with type date | 8 |
|
||||
|
||||
|
||||
|
||||
Scenario Outline: Create a new Data of pm table
|
||||
Given POST this data:
|
||||
@@ -131,7 +189,6 @@ Scenario Outline: Create a new Data of pm table
|
||||
Examples:
|
||||
|
||||
| pmt_uid_number |
|
||||
| 1 |
|
||||
| 4 |
|
||||
| 5 |
|
||||
| 6 |
|
||||
@@ -155,7 +212,6 @@ Scenario Outline: Update a a data of pm table
|
||||
Examples:
|
||||
|
||||
| pmt_uid_number |
|
||||
| 1 |
|
||||
| 4 |
|
||||
| 6 |
|
||||
|
||||
@@ -232,7 +288,7 @@ Scenario: Get the PMTABLE List when there are exactly two pmtables in this works
|
||||
And the response charset is "UTF-8"
|
||||
And the content type is "application/json"
|
||||
And the type is "array"
|
||||
And the response has 8 records
|
||||
And the response has 9 records
|
||||
|
||||
#Test Delete of data
|
||||
|
||||
@@ -319,6 +375,7 @@ Scenario Outline: Delete a pm table of a pmtable
|
||||
| 5 |
|
||||
| 6 |
|
||||
| 7 |
|
||||
| 8 |
|
||||
|
||||
|
||||
Scenario: Get the PMTABLE List when there are exactly ONE pmtables in this workspace
|
||||
|
||||
@@ -201,6 +201,7 @@ Scenario Outline: Delete file
|
||||
| delete mailtemplates subfolder | 4 |
|
||||
| delete mailtemplates subfolder | 5 |
|
||||
| delete mailtemplates subfolder | 6 |
|
||||
| delete | 7 |
|
||||
|
||||
|
||||
Scenario Outline: Delete folder
|
||||
@@ -218,10 +219,11 @@ Scenario Outline: Delete folder
|
||||
#BUG 15207, The "Upload" accepts files with other extensions
|
||||
|
||||
Scenario Outline: Upload files with incorret extension ".exe" - "Project - Process Complete BPMN"
|
||||
Given POST I want to upload the file "<file>" to path "<prf_path>". Url "project/1455892245368ebeb11c1a5001393784/file-manager"
|
||||
And store "prf_uid" in session array as variable "prf_uid_<prf_number>"
|
||||
Given POST I want to upload the file "<file>" to path "<prf_path>". Url "project/1265557095225ff5c688f46031700471/file-manager"
|
||||
#And store "prf_uid" in session array as variable "prf_uid_<prf_number>"
|
||||
And the response status message should have the following text "incorrect extension"
|
||||
|
||||
Examples:
|
||||
| file | prf_path | prf_number |
|
||||
| SnagIt823.exe | templates | 1 |
|
||||
| file | prf_path | prf_number |
|
||||
| filemanager.exe | templates | 1 |
|
||||
|
||||
|
||||
@@ -773,7 +773,18 @@ Scenario Outline: Import a process - Test process NEW
|
||||
|
||||
|
||||
|
||||
Scenario Outline: Delete a Project activity created previously in this script - Test process NEW
|
||||
Given that I want to delete a resource with the key "prj_uid" stored in session array as variable "prj_uid_<prj_uid_number>"
|
||||
And I request "projects"
|
||||
And the content type is "application/json"
|
||||
Then the response status code should be 200
|
||||
And the response charset is "UTF-8"
|
||||
And the type is "object"
|
||||
|
||||
Examples:
|
||||
|
||||
| prj_uid_number |
|
||||
| 7 |
|
||||
|
||||
|
||||
|
||||
@@ -804,8 +815,7 @@ Scenario Outline: Delete a Project activity created previously in this script
|
||||
| 4 |
|
||||
| 5 |
|
||||
| 6 |
|
||||
| 7 |
|
||||
|
||||
|
||||
|
||||
Scenario: Get a list of projects
|
||||
Given I request "project"
|
||||
|
||||
@@ -80,8 +80,10 @@ class RestContext extends BehatContext
|
||||
$parameters = $this->_parameters;
|
||||
|
||||
if(($name=="uploadFilesFolder")&&(!isset($parameters[$name]) ) ){
|
||||
$parameters[$name] = "/opt/uploadfiles/";
|
||||
$defaultUploadPath = __DIR__ . "/../resources/uploadfiles/";
|
||||
$parameters[$name] = $defaultUploadPath;
|
||||
}
|
||||
$this->printDebug("Parameter: $name = ".$parameters[$name]);
|
||||
return (isset($parameters[$name])) ? $parameters[$name] : null;
|
||||
}
|
||||
}
|
||||
@@ -1397,57 +1399,36 @@ class RestContext extends BehatContext
|
||||
public function postIWantToUploadTheFileToPathPublicUrl($prfFile, $prfPath, $url)
|
||||
{
|
||||
$prfFile = $this->getParameter('uploadFilesFolder') . $prfFile;
|
||||
$baseUrl = $this->getParameter('base_url');
|
||||
$url = $baseUrl.$url;
|
||||
$accesstoken = $this->getParameter('access_token');
|
||||
$headr = array();
|
||||
$headr[] = 'Authorization: Bearer '.$accesstoken;
|
||||
$path = rtrim($prfPath, '/') . '/';
|
||||
$sfile = end(explode("/",$prfFile));
|
||||
$ch = curl_init();
|
||||
curl_setopt($ch, CURLOPT_URL,$url);
|
||||
curl_setopt($ch, CURLOPT_HTTPHEADER,$headr);
|
||||
curl_setopt($ch, CURLOPT_POSTFIELDS, array('prf_filename'=>$sfile, "prf_path" => $path));
|
||||
curl_setopt($ch, CURLOPT_USERAGENT,'Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.8.1.13) Gecko/20080311 Firefox/2.0.0.13');
|
||||
curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
|
||||
$postResult = curl_exec($ch);
|
||||
|
||||
$postFields = array('prf_filename'=>$sfile, "prf_path" => $path);
|
||||
|
||||
curl_close($ch);
|
||||
$this->_restObjectMethod = 'post';
|
||||
$this->_restObject = $postFields;
|
||||
$this->iRequest($url);
|
||||
|
||||
$postResult = json_decode($this->_response->getBody(true));
|
||||
|
||||
|
||||
if(!isset($postResult->error)){
|
||||
|
||||
|
||||
$prfUid = $postResult->prf_uid;
|
||||
$url = $this->getParameter('base_url').$url.'/'.$prfUid."/upload";
|
||||
$ch = curl_init();
|
||||
curl_setopt($ch, CURLOPT_URL,$url);
|
||||
curl_setopt($ch, CURLOPT_HTTPHEADER,$headr);
|
||||
curl_setopt($ch, CURLOPT_POSTFIELDS, array('prf_file'=>'@'.$prfFile));
|
||||
curl_setopt($ch, CURLOPT_USERAGENT,'Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.8.1.13) Gecko/20080311 Firefox/2.0.0.13');
|
||||
curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
|
||||
$postResult = curl_exec($ch);
|
||||
curl_close($ch);
|
||||
}
|
||||
|
||||
//Save result as usual
|
||||
$this->_type = 'json';
|
||||
$this->_data = json_decode($postResult);
|
||||
|
||||
$postResult = (array)json_decode($postResult);
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
if (sizeof($postResult) > 2) {
|
||||
$prfUid = $postResult["prf_uid"];
|
||||
} else {
|
||||
throw new Exception($postResult["error"]->message);
|
||||
//var_dump($postResult["error"]);
|
||||
}
|
||||
$url = $url.'/'.$prfUid."/upload";
|
||||
$ch = curl_init();
|
||||
curl_setopt($ch, CURLOPT_URL,$url);
|
||||
curl_setopt($ch, CURLOPT_HTTPHEADER,$headr);
|
||||
curl_setopt($ch, CURLOPT_POSTFIELDS, array('prf_file'=>'@'.$prfFile));
|
||||
curl_setopt($ch, CURLOPT_USERAGENT,'Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.8.1.13) Gecko/20080311 Firefox/2.0.0.13');
|
||||
curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
|
||||
$postResult = curl_exec($ch);
|
||||
curl_close($ch);
|
||||
|
||||
//se guarda el prf_uid en una variable
|
||||
|
||||
//Wen: Esto borra todo el session data, por favor corregir o no guardar la variable desde aca
|
||||
|
||||
//$varName = 'prf_uid';
|
||||
//$sessionData = new StdClass();
|
||||
//$sessionData->$varName = $prfUid;
|
||||
//file_put_contents("session.data", json_encode($sessionData));
|
||||
}
|
||||
|
||||
//UPLOAD IMAGE
|
||||
@@ -1578,7 +1559,6 @@ class RestContext extends BehatContext
|
||||
$this->_restObjectMethod = 'post';
|
||||
$this->_restObject = $postFields;
|
||||
$this->iRequest($url);
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
6140
features/resources/uploadfiles/ExpBehat_Process_Complete_BPMN.pmx
Normal file
6140
features/resources/uploadfiles/ExpBehat_Process_Complete_BPMN.pmx
Normal file
File diff suppressed because one or more lines are too long
185
features/resources/uploadfiles/Export_process_empty.pmx
Normal file
185
features/resources/uploadfiles/Export_process_empty.pmx
Normal file
File diff suppressed because one or more lines are too long
8693
features/resources/uploadfiles/Process_Complete_BPMN.pmx
Normal file
8693
features/resources/uploadfiles/Process_Complete_BPMN.pmx
Normal file
File diff suppressed because one or more lines are too long
1401
features/resources/uploadfiles/Process_NewCreate_BPMN.pmx
Normal file
1401
features/resources/uploadfiles/Process_NewCreate_BPMN.pmx
Normal file
File diff suppressed because one or more lines are too long
BIN
features/resources/uploadfiles/SnagIt823.exe
Normal file
BIN
features/resources/uploadfiles/SnagIt823.exe
Normal file
Binary file not shown.
1
features/resources/uploadfiles/TestQA.html
Normal file
1
features/resources/uploadfiles/TestQA.html
Normal file
@@ -0,0 +1 @@
|
||||
Test QA - cuando se realiza la sobreescritura desde upload
|
||||
418
features/resources/uploadfiles/Test_Event_without_name.pmx
Normal file
418
features/resources/uploadfiles/Test_Event_without_name.pmx
Normal file
@@ -0,0 +1,418 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<ProcessMaker-Project version="3.0">
|
||||
<metadata>
|
||||
<meta key="vendor_version"><![CDATA[(Branch master)]]></meta>
|
||||
<meta key="vendor_version_code">Michelangelo</meta>
|
||||
<meta key="export_timestamp">1406219137</meta>
|
||||
<meta key="export_datetime"><![CDATA[2014-07-24T12:25:37-04:00]]></meta>
|
||||
<meta key="export_server_addr"><![CDATA[192.168.11.61:80]]></meta>
|
||||
<meta key="export_server_os">Linux</meta>
|
||||
<meta key="export_server_php_version">50303</meta>
|
||||
<meta key="export_version">1</meta>
|
||||
<meta key="workspace">wendy</meta>
|
||||
<meta key="name">Test Event without name</meta>
|
||||
<meta key="uid">94680007453d127911f1807046082505</meta>
|
||||
</metadata>
|
||||
<definition class="BPMN">
|
||||
<table name="ACTIVITY">
|
||||
<record>
|
||||
<act_uid>53934277653d127b5101794059367509</act_uid>
|
||||
<prj_uid>94680007453d127911f1807046082505</prj_uid>
|
||||
<pro_uid>37421848753d12791391503085331505</pro_uid>
|
||||
<act_name><![CDATA[Task # 1]]></act_name>
|
||||
<act_type>TASK</act_type>
|
||||
<act_is_for_compensation>0</act_is_for_compensation>
|
||||
<act_start_quantity>1</act_start_quantity>
|
||||
<act_completion_quantity>0</act_completion_quantity>
|
||||
<act_task_type>EMPTY</act_task_type>
|
||||
<act_implementation></act_implementation>
|
||||
<act_instantiate>0</act_instantiate>
|
||||
<act_script_type></act_script_type>
|
||||
<act_script></act_script>
|
||||
<act_loop_type>NONE</act_loop_type>
|
||||
<act_test_before>0</act_test_before>
|
||||
<act_loop_maximum>0</act_loop_maximum>
|
||||
<act_loop_condition>0</act_loop_condition>
|
||||
<act_loop_cardinality>0</act_loop_cardinality>
|
||||
<act_loop_behavior>0</act_loop_behavior>
|
||||
<act_is_adhoc>0</act_is_adhoc>
|
||||
<act_is_collapsed>0</act_is_collapsed>
|
||||
<act_completion_condition>0</act_completion_condition>
|
||||
<act_ordering>0</act_ordering>
|
||||
<act_cancel_remaining_instances>0</act_cancel_remaining_instances>
|
||||
<act_protocol>0</act_protocol>
|
||||
<act_method>0</act_method>
|
||||
<act_is_global>0</act_is_global>
|
||||
<act_referer>0</act_referer>
|
||||
<act_default_flow>0</act_default_flow>
|
||||
<act_master_diagram>0</act_master_diagram>
|
||||
<bou_uid>18188020553d127b513f4c2081532046</bou_uid>
|
||||
<dia_uid>24888535453d127912abb53024205853</dia_uid>
|
||||
<element_uid>53934277653d127b5101794059367509</element_uid>
|
||||
<bou_element>pm_canvas</bou_element>
|
||||
<bou_element_type>bpmnActivity</bou_element_type>
|
||||
<bou_x>319</bou_x>
|
||||
<bou_y>114</bou_y>
|
||||
<bou_width>150</bou_width>
|
||||
<bou_height>75</bou_height>
|
||||
<bou_rel_position>0</bou_rel_position>
|
||||
<bou_size_identical>0</bou_size_identical>
|
||||
<bou_container>bpmnDiagram</bou_container>
|
||||
</record>
|
||||
</table>
|
||||
<table name="ARTIFACT"/>
|
||||
<table name="BOUND">
|
||||
<record>
|
||||
<bou_uid>18188020553d127b513f4c2081532046</bou_uid>
|
||||
<prj_uid>94680007453d127911f1807046082505</prj_uid>
|
||||
<dia_uid>24888535453d127912abb53024205853</dia_uid>
|
||||
<element_uid>53934277653d127b5101794059367509</element_uid>
|
||||
<bou_element>pm_canvas</bou_element>
|
||||
<bou_element_type>bpmnActivity</bou_element_type>
|
||||
<bou_x>319</bou_x>
|
||||
<bou_y>114</bou_y>
|
||||
<bou_width>150</bou_width>
|
||||
<bou_height>75</bou_height>
|
||||
<bou_rel_position>0</bou_rel_position>
|
||||
<bou_size_identical>0</bou_size_identical>
|
||||
<bou_container>bpmnDiagram</bou_container>
|
||||
</record>
|
||||
<record>
|
||||
<bou_uid>44072658053d127b5270045087106677</bou_uid>
|
||||
<prj_uid>94680007453d127911f1807046082505</prj_uid>
|
||||
<dia_uid>24888535453d127912abb53024205853</dia_uid>
|
||||
<element_uid>89601044553d127b52634d4017150624</element_uid>
|
||||
<bou_element>pm_canvas</bou_element>
|
||||
<bou_element_type>bpmnEvent</bou_element_type>
|
||||
<bou_x>219</bou_x>
|
||||
<bou_y>134</bou_y>
|
||||
<bou_width>33</bou_width>
|
||||
<bou_height>33</bou_height>
|
||||
<bou_rel_position>0</bou_rel_position>
|
||||
<bou_size_identical>0</bou_size_identical>
|
||||
<bou_container>bpmnDiagram</bou_container>
|
||||
</record>
|
||||
<record>
|
||||
<bou_uid>75152933753d127b52d70e6074836820</bou_uid>
|
||||
<prj_uid>94680007453d127911f1807046082505</prj_uid>
|
||||
<dia_uid>24888535453d127912abb53024205853</dia_uid>
|
||||
<element_uid>51368855353d127b52c8904071509317</element_uid>
|
||||
<bou_element>pm_canvas</bou_element>
|
||||
<bou_element_type>bpmnEvent</bou_element_type>
|
||||
<bou_x>542</bou_x>
|
||||
<bou_y>134</bou_y>
|
||||
<bou_width>33</bou_width>
|
||||
<bou_height>33</bou_height>
|
||||
<bou_rel_position>0</bou_rel_position>
|
||||
<bou_size_identical>0</bou_size_identical>
|
||||
<bou_container>bpmnDiagram</bou_container>
|
||||
</record>
|
||||
</table>
|
||||
<table name="DATA"/>
|
||||
<table name="DIAGRAM">
|
||||
<record>
|
||||
<dia_uid>24888535453d127912abb53024205853</dia_uid>
|
||||
<prj_uid>94680007453d127911f1807046082505</prj_uid>
|
||||
<dia_name>Test Event without name</dia_name>
|
||||
<dia_is_closable>0</dia_is_closable>
|
||||
</record>
|
||||
</table>
|
||||
<table name="DOCUMENTATION"/>
|
||||
<table name="EVENT">
|
||||
<record>
|
||||
<evn_uid>51368855353d127b52c8904071509317</evn_uid>
|
||||
<prj_uid>94680007453d127911f1807046082505</prj_uid>
|
||||
<pro_uid>37421848753d12791391503085331505</pro_uid>
|
||||
<evn_name></evn_name>
|
||||
<evn_type>END</evn_type>
|
||||
<evn_marker>EMPTY</evn_marker>
|
||||
<evn_is_interrupting>1</evn_is_interrupting>
|
||||
<evn_attached_to></evn_attached_to>
|
||||
<evn_cancel_activity>0</evn_cancel_activity>
|
||||
<evn_activity_ref></evn_activity_ref>
|
||||
<evn_wait_for_completion>0</evn_wait_for_completion>
|
||||
<evn_error_name></evn_error_name>
|
||||
<evn_error_code></evn_error_code>
|
||||
<evn_escalation_name></evn_escalation_name>
|
||||
<evn_escalation_code></evn_escalation_code>
|
||||
<evn_condition></evn_condition>
|
||||
<evn_message></evn_message>
|
||||
<evn_operation_implementation_ref></evn_operation_implementation_ref>
|
||||
<evn_time_date></evn_time_date>
|
||||
<evn_time_cycle></evn_time_cycle>
|
||||
<evn_time_duration></evn_time_duration>
|
||||
<evn_behavior>THROW</evn_behavior>
|
||||
<evn_operation_name></evn_operation_name>
|
||||
<bou_uid>75152933753d127b52d70e6074836820</bou_uid>
|
||||
<dia_uid>24888535453d127912abb53024205853</dia_uid>
|
||||
<element_uid>51368855353d127b52c8904071509317</element_uid>
|
||||
<bou_element>pm_canvas</bou_element>
|
||||
<bou_element_type>bpmnEvent</bou_element_type>
|
||||
<bou_x>542</bou_x>
|
||||
<bou_y>134</bou_y>
|
||||
<bou_width>33</bou_width>
|
||||
<bou_height>33</bou_height>
|
||||
<bou_rel_position>0</bou_rel_position>
|
||||
<bou_size_identical>0</bou_size_identical>
|
||||
<bou_container>bpmnDiagram</bou_container>
|
||||
</record>
|
||||
<record>
|
||||
<evn_uid>89601044553d127b52634d4017150624</evn_uid>
|
||||
<prj_uid>94680007453d127911f1807046082505</prj_uid>
|
||||
<pro_uid>37421848753d12791391503085331505</pro_uid>
|
||||
<evn_name></evn_name>
|
||||
<evn_type>START</evn_type>
|
||||
<evn_marker>EMPTY</evn_marker>
|
||||
<evn_is_interrupting>1</evn_is_interrupting>
|
||||
<evn_attached_to></evn_attached_to>
|
||||
<evn_cancel_activity>0</evn_cancel_activity>
|
||||
<evn_activity_ref></evn_activity_ref>
|
||||
<evn_wait_for_completion>0</evn_wait_for_completion>
|
||||
<evn_error_name></evn_error_name>
|
||||
<evn_error_code></evn_error_code>
|
||||
<evn_escalation_name></evn_escalation_name>
|
||||
<evn_escalation_code></evn_escalation_code>
|
||||
<evn_condition></evn_condition>
|
||||
<evn_message>LEAD</evn_message>
|
||||
<evn_operation_implementation_ref></evn_operation_implementation_ref>
|
||||
<evn_time_date></evn_time_date>
|
||||
<evn_time_cycle></evn_time_cycle>
|
||||
<evn_time_duration></evn_time_duration>
|
||||
<evn_behavior>CATCH</evn_behavior>
|
||||
<evn_operation_name></evn_operation_name>
|
||||
<bou_uid>44072658053d127b5270045087106677</bou_uid>
|
||||
<dia_uid>24888535453d127912abb53024205853</dia_uid>
|
||||
<element_uid>89601044553d127b52634d4017150624</element_uid>
|
||||
<bou_element>pm_canvas</bou_element>
|
||||
<bou_element_type>bpmnEvent</bou_element_type>
|
||||
<bou_x>219</bou_x>
|
||||
<bou_y>134</bou_y>
|
||||
<bou_width>33</bou_width>
|
||||
<bou_height>33</bou_height>
|
||||
<bou_rel_position>0</bou_rel_position>
|
||||
<bou_size_identical>0</bou_size_identical>
|
||||
<bou_container>bpmnDiagram</bou_container>
|
||||
</record>
|
||||
</table>
|
||||
<table name="EXTENSION"/>
|
||||
<table name="FLOW">
|
||||
<record>
|
||||
<flo_uid>92006883953d127b5362405057168331</flo_uid>
|
||||
<prj_uid>94680007453d127911f1807046082505</prj_uid>
|
||||
<dia_uid>24888535453d127912abb53024205853</dia_uid>
|
||||
<flo_type>SEQUENCE</flo_type>
|
||||
<flo_name></flo_name>
|
||||
<flo_element_origin>89601044553d127b52634d4017150624</flo_element_origin>
|
||||
<flo_element_origin_type>bpmnEvent</flo_element_origin_type>
|
||||
<flo_element_origin_port>0</flo_element_origin_port>
|
||||
<flo_element_dest>53934277653d127b5101794059367509</flo_element_dest>
|
||||
<flo_element_dest_type>bpmnActivity</flo_element_dest_type>
|
||||
<flo_element_dest_port>0</flo_element_dest_port>
|
||||
<flo_is_inmediate>1</flo_is_inmediate>
|
||||
<flo_condition></flo_condition>
|
||||
<flo_x1>247</flo_x1>
|
||||
<flo_y1>146</flo_y1>
|
||||
<flo_x2>313</flo_x2>
|
||||
<flo_y2>146</flo_y2>
|
||||
<flo_state><![CDATA[[{"x":252,"y":151},{"x":285,"y":151},{"x":285,"y":153},{"x":318,"y":153}]]]></flo_state>
|
||||
</record>
|
||||
<record>
|
||||
<flo_uid>92493570053d127b5365ab4078407695</flo_uid>
|
||||
<prj_uid>94680007453d127911f1807046082505</prj_uid>
|
||||
<dia_uid>24888535453d127912abb53024205853</dia_uid>
|
||||
<flo_type>SEQUENCE</flo_type>
|
||||
<flo_name></flo_name>
|
||||
<flo_element_origin>53934277653d127b5101794059367509</flo_element_origin>
|
||||
<flo_element_origin_type>bpmnActivity</flo_element_origin_type>
|
||||
<flo_element_origin_port>0</flo_element_origin_port>
|
||||
<flo_element_dest>51368855353d127b52c8904071509317</flo_element_dest>
|
||||
<flo_element_dest_type>bpmnEvent</flo_element_dest_type>
|
||||
<flo_element_dest_port>0</flo_element_dest_port>
|
||||
<flo_is_inmediate>1</flo_is_inmediate>
|
||||
<flo_condition></flo_condition>
|
||||
<flo_x1>466</flo_x1>
|
||||
<flo_y1>146</flo_y1>
|
||||
<flo_x2>537</flo_x2>
|
||||
<flo_y2>146</flo_y2>
|
||||
<flo_state><![CDATA[[{"x":471,"y":153},{"x":506,"y":153},{"x":506,"y":146},{"x":542,"y":146}]]]></flo_state>
|
||||
</record>
|
||||
</table>
|
||||
<table name="GATEWAY"/>
|
||||
<table name="LANE"/>
|
||||
<table name="LANESET"/>
|
||||
<table name="PARTICIPANT"/>
|
||||
<table name="PROCESS">
|
||||
<record>
|
||||
<pro_uid>37421848753d12791391503085331505</pro_uid>
|
||||
<prj_uid>94680007453d127911f1807046082505</prj_uid>
|
||||
<dia_uid>24888535453d127912abb53024205853</dia_uid>
|
||||
<pro_name>Test Event without name</pro_name>
|
||||
<pro_type>NONE</pro_type>
|
||||
<pro_is_executable>0</pro_is_executable>
|
||||
<pro_is_closed>0</pro_is_closed>
|
||||
<pro_is_subprocess>0</pro_is_subprocess>
|
||||
</record>
|
||||
</table>
|
||||
<table name="PROJECT">
|
||||
<record>
|
||||
<prj_uid>94680007453d127911f1807046082505</prj_uid>
|
||||
<prj_name>Test Event without name</prj_name>
|
||||
<prj_description></prj_description>
|
||||
<prj_target_namespace></prj_target_namespace>
|
||||
<prj_expresion_language></prj_expresion_language>
|
||||
<prj_type_language></prj_type_language>
|
||||
<prj_exporter></prj_exporter>
|
||||
<prj_exporter_version></prj_exporter_version>
|
||||
<prj_create_date><![CDATA[2014-07-24 11:34:41]]></prj_create_date>
|
||||
<prj_update_date><![CDATA[2014-07-24 11:36:48]]></prj_update_date>
|
||||
<prj_author>00000000000000000000000000000001</prj_author>
|
||||
<prj_author_version></prj_author_version>
|
||||
<prj_original_source></prj_original_source>
|
||||
</record>
|
||||
</table>
|
||||
</definition>
|
||||
<definition class="workflow">
|
||||
<table name="process">
|
||||
<record>
|
||||
<pro_uid>94680007453d127911f1807046082505</pro_uid>
|
||||
<pro_parent>94680007453d127911f1807046082505</pro_parent>
|
||||
<pro_time>1</pro_time>
|
||||
<pro_timeunit>DAYS</pro_timeunit>
|
||||
<pro_status>ACTIVE</pro_status>
|
||||
<pro_type_day></pro_type_day>
|
||||
<pro_type>NORMAL</pro_type>
|
||||
<pro_assignment>FALSE</pro_assignment>
|
||||
<pro_show_map>0</pro_show_map>
|
||||
<pro_show_message>0</pro_show_message>
|
||||
<pro_subprocess>0</pro_subprocess>
|
||||
<pro_tri_deleted></pro_tri_deleted>
|
||||
<pro_tri_canceled></pro_tri_canceled>
|
||||
<pro_tri_paused></pro_tri_paused>
|
||||
<pro_tri_reassigned></pro_tri_reassigned>
|
||||
<pro_show_delegate>0</pro_show_delegate>
|
||||
<pro_show_dynaform>0</pro_show_dynaform>
|
||||
<pro_category></pro_category>
|
||||
<pro_sub_category></pro_sub_category>
|
||||
<pro_industry>0</pro_industry>
|
||||
<pro_update_date></pro_update_date>
|
||||
<pro_create_date><![CDATA[2014-07-24 11:34:41]]></pro_create_date>
|
||||
<pro_create_user>00000000000000000000000000000001</pro_create_user>
|
||||
<pro_height>5000</pro_height>
|
||||
<pro_width>10000</pro_width>
|
||||
<pro_title_x>0</pro_title_x>
|
||||
<pro_title_y>0</pro_title_y>
|
||||
<pro_debug>0</pro_debug>
|
||||
<pro_dynaforms></pro_dynaforms>
|
||||
<pro_derivation_screen_tpl></pro_derivation_screen_tpl>
|
||||
<pro_description></pro_description>
|
||||
<pro_title>Test Event without name</pro_title>
|
||||
<pro_category_label>No Category</pro_category_label>
|
||||
</record>
|
||||
</table>
|
||||
<table name="tasks">
|
||||
<record>
|
||||
<pro_uid>94680007453d127911f1807046082505</pro_uid>
|
||||
<tas_uid>53934277653d127b5101794059367509</tas_uid>
|
||||
<tas_type>NORMAL</tas_type>
|
||||
<tas_duration>1</tas_duration>
|
||||
<tas_delay_type></tas_delay_type>
|
||||
<tas_temporizer>0</tas_temporizer>
|
||||
<tas_type_day></tas_type_day>
|
||||
<tas_timeunit>DAYS</tas_timeunit>
|
||||
<tas_alert>FALSE</tas_alert>
|
||||
<tas_priority_variable></tas_priority_variable>
|
||||
<tas_assign_type>BALANCED</tas_assign_type>
|
||||
<tas_assign_variable><![CDATA[@@SYS_NEXT_USER_TO_BE_ASSIGNED]]></tas_assign_variable>
|
||||
<tas_group_variable></tas_group_variable>
|
||||
<tas_mi_instance_variable><![CDATA[@@SYS_VAR_TOTAL_INSTANCE]]></tas_mi_instance_variable>
|
||||
<tas_mi_complete_variable><![CDATA[@@SYS_VAR_TOTAL_INSTANCES_COMPLETE]]></tas_mi_complete_variable>
|
||||
<tas_assign_location>FALSE</tas_assign_location>
|
||||
<tas_assign_location_adhoc>FALSE</tas_assign_location_adhoc>
|
||||
<tas_transfer_fly>FALSE</tas_transfer_fly>
|
||||
<tas_last_assigned>0</tas_last_assigned>
|
||||
<tas_user>0</tas_user>
|
||||
<tas_can_upload>FALSE</tas_can_upload>
|
||||
<tas_view_upload>FALSE</tas_view_upload>
|
||||
<tas_view_additional_documentation>FALSE</tas_view_additional_documentation>
|
||||
<tas_can_cancel>FALSE</tas_can_cancel>
|
||||
<tas_owner_app>FALSE</tas_owner_app>
|
||||
<stg_uid></stg_uid>
|
||||
<tas_can_pause>FALSE</tas_can_pause>
|
||||
<tas_can_send_message>TRUE</tas_can_send_message>
|
||||
<tas_can_delete_docs>FALSE</tas_can_delete_docs>
|
||||
<tas_self_service>FALSE</tas_self_service>
|
||||
<tas_start>TRUE</tas_start>
|
||||
<tas_to_last_user>FALSE</tas_to_last_user>
|
||||
<tas_send_last_email>FALSE</tas_send_last_email>
|
||||
<tas_derivation>NORMAL</tas_derivation>
|
||||
<tas_posx>319</tas_posx>
|
||||
<tas_posy>114</tas_posy>
|
||||
<tas_width>110</tas_width>
|
||||
<tas_height>60</tas_height>
|
||||
<tas_color></tas_color>
|
||||
<tas_evn_uid></tas_evn_uid>
|
||||
<tas_boundary></tas_boundary>
|
||||
<tas_derivation_screen_tpl></tas_derivation_screen_tpl>
|
||||
<tas_selfservice_timeout>0</tas_selfservice_timeout>
|
||||
<tas_selfservice_time></tas_selfservice_time>
|
||||
<tas_selfservice_time_unit></tas_selfservice_time_unit>
|
||||
<tas_selfservice_trigger_uid></tas_selfservice_trigger_uid>
|
||||
<tas_title><![CDATA[Task # 1]]></tas_title>
|
||||
<tas_description></tas_description>
|
||||
<tas_def_title></tas_def_title>
|
||||
<tas_def_description></tas_def_description>
|
||||
<tas_def_proc_code></tas_def_proc_code>
|
||||
<tas_def_message></tas_def_message>
|
||||
<tas_def_subject_message></tas_def_subject_message>
|
||||
</record>
|
||||
</table>
|
||||
<table name="routes">
|
||||
<record>
|
||||
<rou_uid>87356152153d127b54113f7090674329</rou_uid>
|
||||
<rou_parent>0</rou_parent>
|
||||
<pro_uid>94680007453d127911f1807046082505</pro_uid>
|
||||
<tas_uid>53934277653d127b5101794059367509</tas_uid>
|
||||
<rou_next_task>-1</rou_next_task>
|
||||
<rou_case>1</rou_case>
|
||||
<rou_type>SEQUENTIAL</rou_type>
|
||||
<rou_condition></rou_condition>
|
||||
<rou_to_last_user>FALSE</rou_to_last_user>
|
||||
<rou_optional>FALSE</rou_optional>
|
||||
<rou_send_email>TRUE</rou_send_email>
|
||||
<rou_sourceanchor>1</rou_sourceanchor>
|
||||
<rou_targetanchor>0</rou_targetanchor>
|
||||
<rou_to_port>1</rou_to_port>
|
||||
<rou_from_port>2</rou_from_port>
|
||||
<rou_evn_uid></rou_evn_uid>
|
||||
<gat_uid></gat_uid>
|
||||
</record>
|
||||
</table>
|
||||
<table name="lanes"/>
|
||||
<table name="gateways"/>
|
||||
<table name="inputs"/>
|
||||
<table name="outputs"/>
|
||||
<table name="dynaforms"/>
|
||||
<table name="steps"/>
|
||||
<table name="triggers"/>
|
||||
<table name="taskusers"/>
|
||||
<table name="groupwfs"/>
|
||||
<table name="steptriggers"/>
|
||||
<table name="dbconnections"/>
|
||||
<table name="reportTables"/>
|
||||
<table name="reportTablesVars"/>
|
||||
<table name="stepSupervisor"/>
|
||||
<table name="objectPermissions"/>
|
||||
<table name="subProcess"/>
|
||||
<table name="caseTracker"/>
|
||||
<table name="caseTrackerObject"/>
|
||||
<table name="stage"/>
|
||||
<table name="fieldCondition"/>
|
||||
<table name="event"/>
|
||||
<table name="caseScheduler"/>
|
||||
<table name="processCategory"/>
|
||||
<table name="taskExtraProperties"/>
|
||||
<table name="processUser"/>
|
||||
<table name="processVariables"/>
|
||||
</definition>
|
||||
<workflow-files/>
|
||||
</ProcessMaker-Project>
|
||||
1192
features/resources/uploadfiles/Test_process_NEW.pmx.pmx
Normal file
1192
features/resources/uploadfiles/Test_process_NEW.pmx.pmx
Normal file
File diff suppressed because it is too large
Load Diff
5
features/resources/uploadfiles/Unnamed_Array.pmx
Normal file
5
features/resources/uploadfiles/Unnamed_Array.pmx
Normal file
@@ -0,0 +1,5 @@
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -0,0 +1,5 @@
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
16
features/resources/uploadfiles/alert_message.html
Normal file
16
features/resources/uploadfiles/alert_message.html
Normal file
@@ -0,0 +1,16 @@
|
||||
|
||||
<table style=\"background-color: white; font-family: Arial,Helvetica,sans-serif; color: black; font-size: 11px; text-align: left;\" cellpadding='10' cellspacing='0' width='100%'>
|
||||
<tbody>
|
||||
<tr><td style='font-size: 14px;'><b>ALERT MESSAGE</b></td></tr>
|
||||
<tr><td style='vertical-align:middel;'>
|
||||
<hr>
|
||||
<br />
|
||||
The Case <b>@#APP_NUMBER</b>, currently in the task <b>@#TAS_TITLE</b>, expired on <b>@#DEL_TASK_DUE_DATE</b>.
|
||||
<br />
|
||||
<br />
|
||||
<hr><b>This Business Process is powered by ProcessMaker.<b><br />
|
||||
<a href='http://www.processmaker.com' style='color:#c40000;'>www.processmaker.com</a>
|
||||
<br />
|
||||
</td></tr>
|
||||
</tbody>
|
||||
</table>
|
||||
80
features/resources/uploadfiles/dynaform1.xml
Normal file
80
features/resources/uploadfiles/dynaform1.xml
Normal file
@@ -0,0 +1,80 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<dynaForm type="xmlform" name="1455892245368ebeb11c1a5001393784/898822326536be3a12addb0034537553" width="500" enabletemplate="0" mode="edit" nextstepsave="" printdynaform="1">
|
||||
<TITULO type="title" enablehtml="0" btn_cancel="Cancel" required="0" readonly="0" savelabel="0">
|
||||
<en>Test Funcionalidad - Dynaform</en>
|
||||
</TITULO>
|
||||
<Subtitulo type="subtitle" enablehtml="0" btn_cancel="Cancel" required="0" readonly="0" savelabel="0">
|
||||
<en>Texto</en>
|
||||
</Subtitulo>
|
||||
<Nombre type="text" maxlength="64" validate="Alpha" required="1" readonly="0" size="15" mode="edit" btn_cancel="Cancel" mask="" strto="UPPER" dependentfields="" defaultvalue="" hint="Fill this field with your name." formula="" function="" sqlconnection="" savelabel="0">
|
||||
<en>Alphabetic-UPPER</en>
|
||||
</Nombre>
|
||||
<Integer type="text" maxlength="64" validate="Int" required="1" readonly="0" size="15" mode="edit" btn_cancel="Cancel">
|
||||
<en>Integer</en>
|
||||
</Integer>
|
||||
<Email type="text" maxlength="64" validate="Email" strto="LOWER" required="1" readonly="0" size="15" mode="edit" btn_cancel="Cancel">
|
||||
<en>Email-lower</en>
|
||||
</Email>
|
||||
<Currency type="currency" maxlength="15" currency="$" validate="Real" mask="###,###,###,###.## $" required="1" readonly="0" size="15" mode="edit" btn_cancel="Cancel" defaultvalue="" hint="" formula="" function="" sqlconnection="" savelabel="0"> <en>Currency-Real </en>
|
||||
</Currency>
|
||||
<Password type="password" maxlength="15" required="1" autocomplete="0" readonly="0" size="15" mode="edit" btn_cancel="Cancel">
|
||||
<en>Password</en>
|
||||
</Password>
|
||||
<Suggest type="suggest" required="1" savelabel="1" size="15" mode="edit" sqlconnection="" maxresults="6" shownoresults="0" store_new_entry="0" table="" primary_key_type="0" btn_cancel="Cancel" defaultvalue="" hint="Fill in with a user name." primary_key="" table_data="" primary_key_data="" primary_key_type_data="" field="" readonly="0"><![CDATA[SELECT USR_UID, USR_USERNAME, CONCAT(USR_FIRSTNAME, " ", USR_LASTNAME) FROM USERS ]]><en>Suggest</en></Suggest>
|
||||
<Text_area type="textarea" required="1" readonly="0" rows="2" cols="32" mode="edit" btn_cancel="Cancel">
|
||||
<en>Text-Area</en>
|
||||
</Text_area>
|
||||
<Subtitulo2 type="subtitle" enablehtml="0" btn_cancel="Cancel" required="0" readonly="0" savelabel="0">
|
||||
<en><![CDATA[Multi-Selección]]></en>
|
||||
</Subtitulo2>
|
||||
<Dropdown type="dropdown" required="1" readonly="0" savelabel="0" mode="edit" options="Array" btn_cancel="Cancel" dependentfields="" defaultvalue="" hint="" sqlconnection="">
|
||||
<en>Dropdown <option name="Grids">Grids</option><option name="Input-Document">Input-Document</option><option name="Output-Document">Output-Document</option><option name="Triggers">Triggers</option></en>
|
||||
</Dropdown>
|
||||
<ListBox type="listbox" required="1" size="4" mode="edit" options="Array" btn_cancel="Cancel">
|
||||
<en>List-Box <option name="Box1">Box1</option>
|
||||
<option name="Box2">Box2</option>
|
||||
<option name="Box3">Box3</option>
|
||||
</en>
|
||||
</ListBox>
|
||||
<Checkbox type="checkbox" value="On" falsevalue="Off" required="1" defaultvalue="Off" readonly="0" labelonright="0" enablehtml="0" btn_cancel="Cancel">
|
||||
<en>Check-Box</en>
|
||||
</Checkbox>
|
||||
<Checkgroup type="checkgroup" mode="edit" options="Array" btn_cancel="Cancel" required="1">
|
||||
<en>Check-group <option name="Check1">Check1</option>
|
||||
<option name="Check2">Check2</option>
|
||||
<option name="Check3">Check3</option>
|
||||
</en>
|
||||
</Checkgroup>
|
||||
<RadioGroup type="radiogroup" required="1" mode="edit" options="Array" btn_cancel="Cancel">
|
||||
<en>Radio-Group <option name="Radio1">Radio1</option>
|
||||
<option name="Radio2">Radio2</option>
|
||||
<option name="Radio3">Radio3</option>
|
||||
</en>
|
||||
</RadioGroup>
|
||||
<Fecha type="date" relativedate="1" beforedate="0m" afterdate="1y" mask="%Y-%m-%d" editable="0" required="1" readonly="0" showtime="0" defaultvalue_sel="today" mode="edit" btn_cancel="Cancel" startdate="" enddate="" defaultvalue="today" hint="" savelabel="0">
|
||||
<en>Fecha</en>
|
||||
</Fecha>
|
||||
<Hidden type="hidden" defaultvalue="Hidden" mode="edit" btn_cancel="Cancel"/>
|
||||
<Link type="link" target_sel="_blank" target="_blank" value="ProcessMaker" btn_cancel="Cancel" link="http://www.processmaker.com" hint="" required="0" readonly="0" savelabel="0">
|
||||
<en>Link</en>
|
||||
</Link>
|
||||
<AddFile type="file" required="0" btn_cancel="Cancel">
|
||||
<en>Add-File</en>
|
||||
</AddFile>
|
||||
<Javascript type="javascript"><![CDATA[alert("Prueba JS");]]></Javascript>
|
||||
<Subtitulo3 type="subtitle" enablehtml="0" btn_cancel="Cancel">
|
||||
<en>Botones</en>
|
||||
</Subtitulo3>
|
||||
<YesNo type="yesno" readonly="0" mode="edit" btn_cancel="Cancel" required="0" defaultvalue="" hint="Oculta el botón (Conditions editor)" savelabel="0">
|
||||
<en>Yes-No</en>
|
||||
</YesNo>
|
||||
<Boton type="button" btn_cancel="Cancel">
|
||||
<en><![CDATA[Botón]]></en>
|
||||
</Boton>
|
||||
<Submit type="submit" btn_cancel="Cancel">
|
||||
<en>Submit</en>
|
||||
</Submit>
|
||||
<Reset type="reset" btn_cancel="Cancel">
|
||||
<en>Reset</en>
|
||||
</Reset>
|
||||
</dynaForm>
|
||||
1
features/resources/uploadfiles/filemanager.exe
Normal file
1
features/resources/uploadfiles/filemanager.exe
Normal file
@@ -0,0 +1 @@
|
||||
fvfvffv
|
||||
BIN
features/resources/uploadfiles/photo/pic1.jpg
Normal file
BIN
features/resources/uploadfiles/photo/pic1.jpg
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 3.4 KiB |
BIN
features/resources/uploadfiles/photo/pic2.jpg
Normal file
BIN
features/resources/uploadfiles/photo/pic2.jpg
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 5.2 KiB |
BIN
features/resources/uploadfiles/photo/pic3.jpg
Normal file
BIN
features/resources/uploadfiles/photo/pic3.jpg
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.8 KiB |
BIN
features/resources/uploadfiles/random.jpg
Normal file
BIN
features/resources/uploadfiles/random.jpg
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 207 KiB |
18
features/resources/uploadfiles/test.pm
Normal file
18
features/resources/uploadfiles/test.pm
Normal file
File diff suppressed because one or more lines are too long
1
features/resources/uploadfiles/test.txt
Normal file
1
features/resources/uploadfiles/test.txt
Normal file
@@ -0,0 +1 @@
|
||||
BEHAT TEST
|
||||
2
features/resources/uploadfiles/test1.html
Normal file
2
features/resources/uploadfiles/test1.html
Normal file
@@ -0,0 +1,2 @@
|
||||
hello world!
|
||||
test file!
|
||||
2
features/resources/uploadfiles/test2.html
Normal file
2
features/resources/uploadfiles/test2.html
Normal file
@@ -0,0 +1,2 @@
|
||||
hello world!
|
||||
test file!
|
||||
@@ -504,14 +504,16 @@ class Applications
|
||||
$oDataset = AppCacheViewPeer::doSelectRS( $Criteria );
|
||||
|
||||
$oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
|
||||
$oDataset->next();
|
||||
//g::pr($oDataset);
|
||||
|
||||
$result = array ();
|
||||
$result['totalCount'] = $totalCount;
|
||||
$rows = array ();
|
||||
$aPriorities = array ('1' => 'VL','2' => 'L','3' => 'N','4' => 'H','5' => 'VH');
|
||||
$index = $start;
|
||||
while ($aRow = $oDataset->getRow()) {
|
||||
|
||||
while ($oDataset->next()) {
|
||||
$aRow = $oDataset->getRow();
|
||||
|
||||
//$aRow = $oAppCache->replaceRowUserData($aRow);
|
||||
|
||||
/*
|
||||
@@ -568,7 +570,6 @@ class Applications
|
||||
}
|
||||
|
||||
$rows[] = $aRow;
|
||||
$oDataset->next();
|
||||
}
|
||||
|
||||
$result['data'] = $rows;
|
||||
|
||||
@@ -1014,6 +1014,7 @@ class DynaForm
|
||||
{
|
||||
try {
|
||||
$arrayVariables = array();
|
||||
$arrayVariablesDef = array();
|
||||
//Verify data
|
||||
Validator::proUid($projectUid, '$prj_uid');
|
||||
$this->throwExceptionIfNotExistsDynaForm($dynaFormUid, "", $this->arrayFieldNameForException["dynaFormUid"]);
|
||||
@@ -1096,9 +1097,6 @@ class DynaForm
|
||||
if (isset($value[0]["readonly"])) {
|
||||
$aVariables = array_merge(array('readonly' => $value[0]["readonly"]), $aVariables);
|
||||
}
|
||||
if (isset($value[0]["readonly"])) {
|
||||
$aVariables = array_merge(array('readonly' => $value[0]["readonly"]), $aVariables);
|
||||
}
|
||||
if (isset($value[0]["colSpan"])) {
|
||||
$aVariables = array_merge(array('colSpan' => $value[0]["colSpan"]), $aVariables);
|
||||
}
|
||||
|
||||
@@ -1512,7 +1512,8 @@ class Process
|
||||
return array(
|
||||
$this->getFieldNameByFormatFieldName("VAR_NAME") => trim($record["name"]),
|
||||
$this->getFieldNameByFormatFieldName("VAR_LABEL") => trim($record["label"]),
|
||||
$this->getFieldNameByFormatFieldName("VAR_TYPE") => trim($record["type"])
|
||||
$this->getFieldNameByFormatFieldName("VAR_TYPE") => trim($record["type"]),
|
||||
$this->getFieldNameByFormatFieldName("VAR_SOURCE") => trim($record["source"])
|
||||
);
|
||||
} catch (\Exception $e) {
|
||||
throw $e;
|
||||
@@ -1566,8 +1567,12 @@ class Process
|
||||
$arrayVar = self::getDynaformsVars($processUid);
|
||||
|
||||
foreach ($arrayVar as $key => $value) {
|
||||
$arrayVariable[] = $this->getVariableDataFromRecord(array("name" => $value["sName"], "label" => $value["sLabel"], "type" => $value["sType"]));
|
||||
$arrayVariable[] = $this->getVariableDataFromRecord(array("name" => $value["sName"], "label" => $value["sLabel"], "type" => $value["sType"], "source" => $value["sUid"]));
|
||||
}
|
||||
|
||||
$arrayHtmlVariable = self::getHtmlFormVars($processUid);
|
||||
$arrayVariable = array_merge($arrayVariable, $arrayHtmlVariable);
|
||||
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -1633,10 +1638,10 @@ class Process
|
||||
if ($bSystemVars) {
|
||||
$aAux = G::getSystemConstants();
|
||||
foreach ($aAux as $sName => $sValue) {
|
||||
$aFields[] = array ('sName' => $sName,'sType' => 'system','sLabel' => G::LoadTranslation('ID_TINY_SYSTEM_VARIABLES'));
|
||||
$aFields[] = array ('sName' => $sName,'sType' => 'system','sLabel' => G::LoadTranslation('ID_TINY_SYSTEM_VARIABLES'), 'sUid' => '');
|
||||
}
|
||||
//we're adding the ping variable to the system list
|
||||
$aFields[] = array ('sName' => 'PIN','sType' => 'system','sLabel' => G::LoadTranslation('ID_TINY_SYSTEM_VARIABLES'));
|
||||
$aFields[] = array ('sName' => 'PIN','sType' => 'system','sLabel' => G::LoadTranslation('ID_TINY_SYSTEM_VARIABLES'), 'sUid' => '');
|
||||
}
|
||||
|
||||
$aInvalidTypes = array("title", "subtitle", "file", "button", "reset", "submit", "javascript");
|
||||
@@ -1648,6 +1653,7 @@ class Process
|
||||
|
||||
$oCriteria = new Criteria( 'workflow' );
|
||||
$oCriteria->addSelectColumn( \DynaformPeer::DYN_FILENAME );
|
||||
$oCriteria->addSelectColumn( \DynaformPeer::DYN_UID );
|
||||
$oCriteria->add( \DynaformPeer::PRO_UID, $sProcessUID );
|
||||
$oCriteria->add( \DynaformPeer::DYN_TYPE, 'xmlform' );
|
||||
$oDataset = \DynaformPeer::doSelectRS( $oCriteria );
|
||||
@@ -1678,8 +1684,8 @@ class Process
|
||||
$aFields[] = array (
|
||||
'sName' => $field->tagName,
|
||||
'sType' => $field->getAttribute("type"),
|
||||
'sLabel' => ($field->getAttribute("type") != 'grid' ? $label : '[ ' . G::LoadTranslation('ID_GRID') . ' ]')
|
||||
);
|
||||
'sLabel' => ($field->getAttribute("type") != 'grid' ? $label : '[ ' . G::LoadTranslation('ID_GRID') . ' ]'),
|
||||
'sUid' => $aRow['DYN_UID']);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1777,5 +1783,44 @@ class Process
|
||||
|
||||
return $aFields;
|
||||
}
|
||||
|
||||
/**
|
||||
* Function getHtmlFormVars
|
||||
*
|
||||
* @access public
|
||||
* @param string $sProcessUID
|
||||
* @return array
|
||||
*/
|
||||
public static function getHtmlFormVars ($sProcessUID)
|
||||
{
|
||||
//Get data
|
||||
$criteria = new \Criteria("workflow");
|
||||
|
||||
$criteria->addSelectColumn(\ProcessVariablesPeer::VAR_UID);
|
||||
$criteria->addSelectColumn(\ProcessVariablesPeer::VAR_NAME);
|
||||
$criteria->addSelectColumn(\ProcessVariablesPeer::VAR_LABEL);
|
||||
$criteria->addSelectColumn(\ProcessVariablesPeer::VAR_FIELD_TYPE);
|
||||
|
||||
$criteria->add(\ProcessVariablesPeer::PRJ_UID, $sProcessUID, \Criteria::EQUAL);
|
||||
|
||||
$rsCriteria = \ProcessVariablesPeer::doSelectRS($criteria);
|
||||
|
||||
$rsCriteria->setFetchmode(\ResultSet::FETCHMODE_ASSOC);
|
||||
|
||||
$rsCriteria->next();
|
||||
$arrayVariables = array();
|
||||
|
||||
while ($aRow = $rsCriteria->getRow()) {
|
||||
$arrayVariables[] = array( 'var_name' => $aRow['VAR_NAME'],
|
||||
'var_label' => $aRow['VAR_LABEL'],
|
||||
'var_type' => $aRow['VAR_FIELD_TYPE'],
|
||||
'var_source' => $aRow['VAR_UID']);
|
||||
$rsCriteria->next();
|
||||
}
|
||||
//Return
|
||||
return $arrayVariables;
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -581,7 +581,7 @@ class Variable
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
} catch (\Exception $e) {
|
||||
throw $e;
|
||||
|
||||
Reference in New Issue
Block a user