fernando/luos
1
0
Fork 0
Code Releases Activity

Merge branch 'master' of bitbucket.org:colosa/processmaker

Browse Source
This commit is contained in:
Brayan Osmar Pereyra Suxo
2014-03-24 10:40:07 -04:00
parent 4dc4fa65dd 241dd9c3b6
commit 0f0659c069
11 changed files with 367 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

98
features/backend/application_cases/case_actions_7-12/basic_sequence_cases_actions_7_12.feature
View File

@@ -6,82 +6,95 @@ Requirements:
Background:
Given that I have a valid access_token
Scenario: Returns information about a given case
Given I request "case"
Scenario: Returns information about a given case of the list Inbox
Given I request "cases/48177942153275bfa28bd04070312685"
Then the response status code should be 200
And the response charset is "UTF-8"
And the type is "array"
And the "ca_prj" property equals "ca_prj"
And the "ca_title" property equals "ca_title"
And the "ca_number" property equals "ca_number"
And the "ca_status" property equals "ca_status"
And the "ca_uid" property equals "ca_uid"
And the "ca_creator" property equals "ca_creator"
And the "ca_date" property equals "ca_date"
And the "ca_update" property equals "ca_update"
And the "ca_lastupdate" property equals "ca_lastupdate"
And the "ca_description" property equals "ca_description"
And the "ca_task" property equals "ca_task"
And the "ca_current_user" property equals "ca_current_user"
And the "ca_delegate" property equals "ca_delegate"
And the "ca_init_date" property equals "ca_init_date"
And the "ca_due_date" property equals "ca_duo_date"
And the "ca_finish_date" property equals "ca_finish_date"
And the "app_uid" property equals "48177942153275bfa28bd04070312685"
And the "app_number" property equals 16
And the "app_name" property equals "#16"
And the "app_status" property equals "TO_DO"
And the "app_init_usr_uid" property equals "00000000000000000000000000000001"
And the "app_init_usr_username" property equals "Administrator"
And the "pro_uid" property equals "99209594750ec27ea338927000421575"
And the "pro_name" property equals "Derivation rules - sequential"
And the "app_create_date" property equals "2014-03-17 16:32:58"
And the "app_update_date" property equals "2014-03-17 16:33:01"
Scenario: Returns the current task for a given case
Given I request "case/uid/current-task"
Scenario: Returns the current task for a given case of the list Inbox
Given I request "cases/48177942153275bfa28bd04070312685/current-task"
Then the response status code should be 200
And the response charset is "UTF-8"
And the type is "array"
And the "ca_prj" property equals "ca_prj"
And the "tas_uid" property equals "73641967750ec281cf015d9009265327"
And the "tas_title" property equals "Cyclical"
And the "del_index" property equals "2"
Scenario: Create a new case in workspace with process Test Micheangelo
Scenario Outline: Create a new case in workspace with process "Derivation rules - sequential"
Given POST this data:
"""
{
"pro_uid": "99209594750ec27ea338927000421575",
"tas_uid": "68707275350ec281ada1c95068712556",
"variables": [{"name": "admin", "lastname":"admin"}]
}
"""
And I request "case"
Then the response status code should be 201
And I request "cases"
Then the response status code should be 200
And the response charset is "UTF-8"
And the content type is "application/json"
And the type is "object"
And store "" in session array
And store "caseId" in session array as variable "caseId_<case_number>"
And store "caseNumber" in session array as variable "caseNumber_<case_number>"
Examples:
| case_number |
| 1 |
Scenario: Create a new case Impersonate in workspace with process Test Micheangelo
Scenario Outline: Create a new case Impersonate in workspace with process "Derivation rules - sequential"
Given POST this data:
"""
{
"pro_uid": "99209594750ec27ea338927000421575",
"usr_uid": "24166330352d56730cdd525035621101",
"tas_uid": "68707275350ec281ada1c95068712556",
"variables": [{"name": "pruebaQA", "amount":"10400"}]
}
"""
And I request "case/impersonate"
Then the response status code should be 201
And I request "cases/impersonate"
Then the response status code should be 200
And the response charset is "UTF-8"
And the content type is "application/json"
And the type is "object"
And store "" in session array
And store "caseId" in session array as variable "caseId_<case_number>"
And store "caseNumber" in session array as variable "caseNumber_<case_number>"
Examples:
| case_number |
| 1 |
Scenario: Returns a list of the cases for the logged in user (Draft)
Given I request "cases/draft"
Then the response status code should be 200
And the response charset is "UTF-8"
And the type is "array"
And the response has 2 records
Scenario: Reassigns a case to a different user
Given PUT this data:
"""
{
"usr_uid_source": "62625000752d5672d6661e6072881167",
"usr_uid_target": "24166330352d56730cdd525035621101",
}
"""
And that I want to update a resource with the key "" stored in session array
And that I want to update a resource with the key "case_number" stored in session array
And I request "case/{uid}/reassign-case"
Then the response status code should be 200
And the content type is "application/json"
@@ -93,9 +106,8 @@ Scenario: Autoderivate a case to the next task in the process
Given PUT this data:
"""
{
"case_uid": "78ef3ca7905019270643749052af5bd7",
"del_index": "1"
}
"""
And that I want to update a resource with the key "" stored in session array

155
features/backend/application_cases/case_actions_7-12/main_tests_cases_actions_7_12.feature
View File

@@ -0,0 +1,155 @@
@ProcessMakerMichelangelo @RestAPI
Feature: Cases Actions - the features in this script are (getCaseInfo, taskCase, newCase, newCaseImpersonate, reassignCase and routeCase)
Requirements:
a workspace with five cases of the process "Test micheangelo" and "Test Users-Step-Properties End Point"
Background:
Given that I have a valid access_token
Scenario: Returns information about a given case of the list Inbox
Given I request "cases/48177942153275bfa28bd04070312685"
Then the response status code should be 200
And the response charset is "UTF-8"
And the type is "array"
And the "app_uid" property equals "48177942153275bfa28bd04070312685"
And the "app_number" property equals 16
And the "app_name" property equals "#16"
And the "app_status" property equals "TO_DO"
And the "app_init_usr_uid" property equals "00000000000000000000000000000001"
And the "app_init_usr_username" property equals "Administrator"
And the "pro_uid" property equals "99209594750ec27ea338927000421575"
And the "pro_name" property equals "Derivation rules - sequential"
And the "app_create_date" property equals "2014-03-17 16:32:58"
And the "app_update_date" property equals "2014-03-17 16:33:01"
Scenario: Returns the current task for a given case of the list Inbox
Given I request "cases/48177942153275bfa28bd04070312685/current-task"
Then the response status code should be 200
And the response charset is "UTF-8"
And the type is "array"
And the "tas_uid" property equals "73641967750ec281cf015d9009265327"
And the "tas_title" property equals "Cyclical"
And the "del_index" property equals "2"
Scenario Outline: Create a new case in workspace with process "Derivation rules - sequential", "Derivation rules - evaluation", "Derivation rules - Parallel", "Derivation rules - parallel evaluation", "Derivation rules - selection"
Given POST this data:
"""
{
"pro_uid": "<pro_uid>",
"tas_uid": "<tas_uid>",
"variables": [{"name": "admin", "lastname":"admin"}]
}
"""
And I request "cases"
Then the response status code should be 200
And the response charset is "UTF-8"
And the content type is "application/json"
And the type is "object"
And store "app_uid" in session array as variable "app_uid_<app_uid_number>"
And store "app_number" in session array as variable "app_number_<app_uid_number>"
Examples:
| Description | app_uid_number | pro_uid | tas_uid | variables |
| Create new case with process "Derivation rules - sequential" | 1 | 99209594750ec27ea338927000421575 | 68707275350ec281ada1c95068712556 | |
| Create new case with process "Derivation rules - evaluation" | 2 | 46279907250ec73b9b25a78031279680 | 99371337850ec73c0a38eb6024620271 | |
| Create new case with process "Derivation rules - Parallel" | 3 | 35894775350ec7daa099378048029617 | 52838134750ec7dd0989fc0015625952 | |
| Create new case with process "Derivation rules - parallel evaluation" | 4 | 34579467750ec8d55e8b115057818502 | 89648437550ec8d593c2159010276089 | |
| Create new case with process "Derivation rules - selection" | 5 | 82458496050ec668981ecc7039804404 | 56900024450ec668e4a9243080698854 | |
Scenario Outline: Create a new case Impersonate in workspace with process "Derivation rules - sequential", "Derivation rules - evaluation", "Derivation rules - Parallel", "Derivation rules - parallel evaluation", "Derivation rules - selection"
Given POST this data:
"""
{
"pro_uid": "<pro_uid>",
"usr_uid": "<usr_uid>",
"tas_uid": "<tas_uid>",
"variables": [{"name": "pruebaQA", "amount":"10400"}]
}
"""
And I request "cases/impersonate"
Then the response status code should be 200
And the response charset is "UTF-8"
And the content type is "application/json"
And the type is "object"
And store "app_uid" in session array as variable "app_uid_<app_uid_number>"
And store "app_number" in session array as variable "app_number_<app_uid_number>"
Examples:
| Description | app_uid_number | pro_uid | usr_uid | tas_uid | variables |
| Create new case with process "Derivation rules - sequential" - Case Start with chris | 6 | 99209594750ec27ea338927000421575 | 24166330352d56730cdd525035621101 | 68707275350ec281ada1c95068712556 | |
| Create new case with process "Derivation rules - evaluation" - Case Start with adam | 7 | 46279907250ec73b9b25a78031279680 | 44811996752d567110634a1013636964 | 99371337850ec73c0a38eb6024620271 | |
| Create new case with process "Derivation rules - Parallel" - Case Start with aaron | 8 | 35894775350ec7daa099378048029617 | 51049032352d56710347233042615067 | 52838134750ec7dd0989fc0015625952 | |
| Create new case with process "Derivation rules - parallel evaluation"- Case Start with jeremiah | 9 | 34579467750ec8d55e8b115057818502 | 86677227852d5671f40ba25017213081 | 89648437550ec8d593c2159010276089 | |
| Create new case with process "Derivation rules - selection" - Case Start with admin | 10 | 82458496050ec668981ecc7039804404 | 62625000752d5672d6661e6072881167 | 56900024450ec668e4a9243080698854 | |
Scenario: Returns a list of the cases for the logged in user (Draft)
Given I request "cases/draft"
Then the response status code should be 200
And the response charset is "UTF-8"
And the type is "array"
And the response has 11 records
Scenario Outline: Reassigns a case to a different user
Given PUT this data:
"""
{
"usr_uid_source": "<usr_uid_source>",
"usr_uid_target": "<usr_uid_target>",
}
"""
And that I want to update a resource with the key "app_uid_<app_uid_number>" stored in session array
And I request "case/app_uid/reassign-case" with the key "app_uid" stored in session array as variable "app_uid_<app_uid_number>"
Then the response status code should be 200
And the content type is "application/json"
And the response charset is "UTF-8"
And the type is "object"
Examples:
| Description | app_uid_number | usr_uid_source | usr_uid_target |
| Reassign the user adam | 1 | 00000000000000000000000000000001 | 44811996752d567110634a1013636964 |
| Reassign the user aaron | 2 | 00000000000000000000000000000001 | 51049032352d56710347233042615067 |
| Reassign the user jeremiah | 3 | 00000000000000000000000000000001 | 86677227852d5671f40ba25017213081 |
| Reassign the user chris | 4 | 00000000000000000000000000000001 | 24166330352d56730cdd525035621101 |
| Reassign the user zachary | 5 | 00000000000000000000000000000001 | 62625000752d5672d6661e6072881167 |
| Reassign the user admin | 6 | 24166330352d56730cdd525035621101 | 00000000000000000000000000000001 |
| Reassign the user admin | 7 | 44811996752d567110634a1013636964 | 00000000000000000000000000000001 |
| Reassign the user admin | 8 | 51049032352d56710347233042615067 | 00000000000000000000000000000001 |
| Reassign the user admin | 9 | 86677227852d5671f40ba25017213081 | 00000000000000000000000000000001 |
| Reassign the user admin | 10 | 62625000752d5672d6661e6072881167 | 00000000000000000000000000000001 |
Scenario Outline: Route a case to the next task in the process
Given PUT this data:
"""
{
}
"""
And that I want to update a resource with the key "app_uid_<app_uid_number>" stored in session array
And I request "case/app_uid/route-case" with the key "app_uid" stored in session array as variable "app_uid_<app_uid_number>"
Then the response status code should be 200
And the content type is "application/json"
And the response charset is "UTF-8"
And the type is "object"
Examples:
| Description | app_uid_number |
| Route next activity "Derivation rules - sequential" | 1 |
| Route next activity "Derivation rules - evaluation" | 2 |
| Route next activity "Derivation rules - Parallel" | 3 |
| Route next activity "Derivation rules - parallel evaluation" | 4 |
| Route next activity "Derivation rules - selection" | 5 |
| Route next activity "Derivation rules - sequential" | 6 |
| Route next activity "Derivation rules - evaluation" | 7 |
| Route next activity "Derivation rules - Parallel" | 8 |
| Route next activity "Derivation rules - parallel evaluation" | 9 |
| Route next activity "Derivation rules - selection" | 10 |

105
features/backend/application_cases/cases_lists_1-6/basic_sequence_cases_lists_1_6.feature
View File

@@ -15,28 +15,6 @@ Scenario: Returns a list of the cases for the logged in user (Inbox)
And the response has 1 records
Scenario: Returns information about a given case of the list Inbox
Given I request "cases/48177942153275bfa28bd04070312685"
Then the response status code should be 200
And the response charset is "UTF-8"
And the type is "array"
And the "guid" property equals "48177942153275bfa28bd04070312685"
And the "name" property equals "16"
And the "status" property equals "TO_DO"
And the "delIndex" property equals "2"
And the "processId" property equals "99209594750ec27ea338927000421575"
Scenario: Returns the current task for a given case of the list Inbox
Given I request "cases/48177942153275bfa28bd04070312685/current-task"
Then the response status code should be 200
And the response charset is "UTF-8"
And the type is "array"
And the "guid" property equals "73641967750ec281cf015d9009265327"
And the "name" property equals "Cyclical"
And the "delegate" property equals "2"
Scenario: Returns a list of the cases for the logged in user (Draft)
Given I request "cases/draft"
Then the response status code should be 200
@@ -69,84 +47,9 @@ Scenario: Returns a list of the cases for the logged in user (Paused)
And the response has 1 records
Scenario Outline: Create a new case in workspace with process "Derivation rules - sequential"
Given POST this data:
"""
{
"prj_uid": "99209594750ec27ea338927000421575",
"act_uid": "68707275350ec281ada1c95068712556",
"variables": [{"name": "admin", "lastname":"admin"}]
}
"""
And I request "cases"
Scenario: Returns a list of the cases for the logged in user (Advanced Search)
Given I request "cases/advanced-search"
Then the response status code should be 200
And the response charset is "UTF-8"
And the content type is "application/json"
And the type is "object"
And store "caseId" in session array as variable "caseId_<case_number>"
And store "caseNumber" in session array as variable "caseNumber_<case_number>"
Examples:
| case_number |
| 1 |
Scenario Outline: Create a new case Impersonate in workspace with process "Derivation rules - sequential"
Given POST this data:
"""
{
"prj_uid": "99209594750ec27ea338927000421575",
"usr_uid": "24166330352d56730cdd525035621101",
"act_uid": "68707275350ec281ada1c95068712556",
"variables": [{"name": "pruebaQA", "amount":"10400"}]
}
"""
And I request "cases/impersonate"
Then the response status code should be 200
And the response charset is "UTF-8"
And the content type is "application/json"
And the type is "object"
And store "caseId" in session array as variable "caseId_<case_number>"
And store "caseNumber" in session array as variable "caseNumber_<case_number>"
Examples:
| case_number |
| 1 |
Scenario: Reassigns a case to a different user
Given PUT this data:
"""
{
"del_index": "53643749052af5bdef3ca79050192707",
"usr_uid_source": "62625000752d5672d6661e6072881167",
"usr_uid_target": "24166330352d56730cdd525035621101"
}
"""
And that I want to update a resource with the key "" stored in session array
And I request "case/{uid}/reassign-case"
Then the response status code should be 200
And the content type is "application/json"
And the response charset is "UTF-8"
And the type is "object"
Scenario: Autoderivate a case to the next task in the process
Given PUT this data:
"""
{
"case_uid": "78ef3ca7905019270643749052af5bd7",
"del_index": "1"
}
"""
And that I want to update a resource with the key "" stored in session array
And I request "case/{uid}/route-case"
Then the response status code should be 200
And the content type is "application/json"
And the response charset is "UTF-8"
And the type is "object"
And the type is "array"
And the response has 1 records

12
features/backend/application_cases/cases_lists_1-6/main_tests_cases_lists_1_6.feature
View File

@@ -1,5 +1,5 @@
@ProcessMakerMichelangelo @RestAPI
Feature: Cases Actions - the features in this script are (inbox, draftCaseList, participatedCaseList, unassignedCaseList, pausedCaseList and advanced Search)
Feature: Cases Actions - the features in this script are (inbox, draftCaseList, participatedCaseList, unassignedCaseList, pausedCaseList and advanced Search) and (getCaseInfo, taskCase, newCase, newCaseImpersonate, reassignCase and routeCase)
Requirements:
a workspace with five of the process "Derivation rules - evaluation", "Derivation rules - Parallel", "Derivation rules - parallel evaluation", "Derivation rules - selection", "Derivation rules - sequential"
@@ -28,7 +28,7 @@ Scenario: Returns a list of the cases for the logged in user (Participated)
Then the response status code should be 200
And the response charset is "UTF-8"
And the type is "array"
And the response has 9 records
And the response has 6 records
Scenario: Returns a list of the cases for the logged in user (Unassigned)
@@ -45,3 +45,11 @@ Scenario: Returns a list of the cases for the logged in user (Paused)
And the response charset is "UTF-8"
And the type is "array"
And the response has 1 records
Scenario: Returns a list of the cases for the logged in user (Advanced Search)
Given I request "cases/advanced-search"
Then the response status code should be 200
And the response charset is "UTF-8"
And the type is "array"
And the response has 1 records

6
features/backend/application_cases/cases_lists_1-6/negative_tests_cases_lists_1_6.feature
View File

@@ -38,3 +38,9 @@ Scenario: Returns a list of the cases for the logged in user (Paused)
Then the response status code should be 400
And the response has 4 records
And the response status message should have the following text "<records>"
Scenario: Returns a list of the cases for the logged in user (Advanced Search)
Given I request "cases/advanced-search"
Then the response status code should be 400
And the response has 4 records
And the response status message should have the following text "<records>"

5
workflow/engine/src/BusinessModel/Cases.php
View File

@@ -258,7 +258,7 @@ class Cases
for ($i = 0; $i<=count($array['current_task'])-1; $i++) {
$current_task = $array['current_task'][$i];
$current_task['usr_uid'] = $current_task['userId'];
$current_task['usr_name'] = $current_task['userName'];
$current_task['usr_name'] = trim($current_task['userName']);
$current_task['tas_uid'] = $current_task['taskId'];
$current_task['tas_title'] = $current_task['taskName'];
$current_task['del_index'] = $current_task['delIndex'];
@@ -349,7 +349,7 @@ class Cases
for ($i = 0; $i<=count($array['current_task'])-1; $i++) {
$current_task = $array['current_task'][$i];
$current_task['usr_uid'] = $current_task['userId'];
$current_task['usr_name'] = $current_task['userName'];
$current_task['usr_name'] = trim($current_task['userName']);
$current_task['tas_uid'] = $current_task['taskId'];
$current_task['tas_title'] = $current_task['taskName'];
$current_task['del_index'] = $current_task['delIndex'];
@@ -432,7 +432,6 @@ class Cases
if(empty($result)) {
throw (new \Exception('Incorrect or unavailable information about this case: ' .$applicationUid));
} else {
$result = json_decode(json_encode($result), false);
return $result;
}
} catch (\Exception $e) {

104
workflow/engine/src/Tests/BusinessModel/CasesTest.php
View File

@@ -171,5 +171,109 @@ class CasesTest extends \PHPUnit_Framework_TestCase
$this->assertTrue(is_numeric($response['totalCount']));
$this->assertTrue(is_array($response['data']));
}
/**
* Test add Case
*
* @covers \BusinessModel\Cases::addCase
*
* @copyright Colosa - Bolivia
*/
public function testAddCase()
{
$response = $this->oCases->addCase('1265557095225ff5c688f46031700471', '46941969352af5be2ab3f39001216717', '00000000000000000000000000000001', array('name' => 'John', 'lastname' => 'Petersson'));
$this->assertTrue(is_object($response));
$aResponse = json_decode(json_encode($response), true);
return $aResponse;
}
/**
* Test get Task Case
*
* @covers \BusinessModel\Cases::getTaskCase
* @depends testAddCase
* @param array $aResponse, Data for parent department
*
* @copyright Colosa - Bolivia
*/
public function testGetTaskCase(array $aResponse)
{
$response = $this->oCases->getTaskCase($aResponse['app_uid'], '00000000000000000000000000000001');
$this->assertTrue(is_array($response));
}
/**
* Test get Case Info
*
* @covers \BusinessModel\Cases::getCaseInfo
* @depends testAddCase
* @param array $aResponse
*
* @copyright Colosa - Bolivia
*/
public function testGetCaseInfo(array $aResponse)
{
$response = $this->oCases->getCaseInfo($aResponse['app_uid'], '00000000000000000000000000000001');
$this->assertTrue(is_object($response));
}
/**
* Test put reassign case
*
* @covers \BusinessModel\Cases::getCaseInfo
* @depends testAddCase
* @param array $aResponse
*
* @copyright Colosa - Bolivia
*/
public function testUpdateReassignCase(array $aResponse)
{
$response = $this->oCases->updateReassignCase($aResponse['app_uid'], '00000000000000000000000000000001', null, '00000000000000000000000000000001', '23063198853206b666e2bd0085065170');
$this->assertTrue(empty($response));
}
/**
* Test add Case to test route case
*
* @covers \BusinessModel\Cases::addCase
*
* @copyright Colosa - Bolivia
*/
public function testAddCaseRouteCase()
{
$response = $this->oCases->addCase('1265557095225ff5c688f46031700471', '46941969352af5be2ab3f39001216717', '00000000000000000000000000000001', array('name' => 'John', 'lastname' => 'Petersson'));
$this->assertTrue(is_object($response));
$aResponseRouteCase = json_decode(json_encode($response), true);
return $aResponseRouteCase;
}
/**
* Test put route case
*
* @covers \BusinessModel\Cases::updateRouteCase
* @depends testAddCaseRouteCase
* @param array $aResponseRouteCase
*
* @copyright Colosa - Bolivia
*/
public function testUpdateRouteCase(array $aResponseRouteCase)
{
$response = $this->oCases->updateRouteCase($aResponseRouteCase['app_uid'], '00000000000000000000000000000001', null);
$this->assertTrue(empty($response));
}
/**
* Test add Case impersonate to test route case
*
* @covers \BusinessModel\Cases::addCaseImpersonate
*
* @copyright Colosa - Bolivia
*/
public function testAddCaseImpersonate()
{
$response = $this->oCases->addCaseImpersonate('1265557095225ff5c688f46031700471', '23063198853206b666e2bd0085065170', '46941969352af5be2ab3f39001216717', array('name' => 'John', 'lastname' => 'Petersson'));
$this->assertTrue(is_object($response));
}
}

6
workflow/engine/templates/designer/index.html
View File

@@ -67,7 +67,7 @@
{/if}
</head>
<body onresize="resizingFrame();">
<section class="navBar">
<section class="navBar" id="idNavBar">
<div class="head"></div>
<nav>
<ul>
@@ -80,10 +80,10 @@
</nav>
</section>
<section class="content">
<div class="bpmn_shapes">
<div class="bpmn_shapes" id="idBpmnShapes">
<div class="head"><span class="mafe-shapes-collapse-icon"></span></div>
</div>
<div class="content_controls">
<div class="content_controls" id="idContentControls">
<div class="head"><span class="mafe-controls-collapse-icon"></span></div>
<ul>
<li>

7
workflow/engine/templates/pmTables/editReport.js
View File

@@ -132,6 +132,7 @@ Ext.onReady(function(){
comboPageSize.setValue(pageSize);
bbarpaging = new Ext.PagingToolbar({
id: 'editReportBbarpaging',
pageSize: pageSize,
store: storeA,
displayInfo: true,
@@ -181,6 +182,7 @@ Ext.onReady(function(){
}
},
{
id: 'availableGridButtonClear',
text: 'X',
ctCls:'pm_search_x_button',
handler: function(){
@@ -188,6 +190,7 @@ Ext.onReady(function(){
filterAvFields();
}
}, {
id: 'availableGridButtonSearch',
text: _('ID_FILTER'),
handler: function(){
filterAvFields();
@@ -553,6 +556,7 @@ Ext.onReady(function(){
loadMask: {message: _('ID_LOADING_GRID')},
tbar : [
{
id: 'assignedGridAddField',
icon: '/images/add-row-after.png',
text: _("ID_ADD_FIELD"),
handler: addColumn
@@ -606,6 +610,7 @@ Ext.onReady(function(){
// (vertical) selection buttons
buttonsPanel = new Ext.Panel({
id: 'buttonsPanelVertical',
width : 40,
layout : {
type:'vbox',
@@ -985,9 +990,11 @@ Ext.onReady(function(){
southPanel = new Ext.FormPanel({
region: 'south',
buttons:[ {
id: 'southPanelCreateUpdate',
text: TABLE === false ? _("ID_CREATE") : _("ID_UPDATE"),
handler: createReportTable
}, {
id: 'southPanelCancel',
text:_("ID_CANCEL"),
handler: function() {
proParam = (typeof('flagProcessmap') != 'undefined' && flagProcessmap == 1) ? (PRO_UID !== false ? '?flagProcessmap=1&PRO_UID='+PRO_UID : '') : '';

3
workflow/engine/templates/pmTables/export.js
View File

@@ -104,6 +104,7 @@ Export.configure = function()
* WINDOW CONFIG
*/
this.windowConfig = {
id: 'windowConfigExport',
title: '',
layout: 'fit',
width: 570,
@@ -117,9 +118,11 @@ Export.configure = function()
}
this.windowConfig.buttons = [{
id: 'windowConfigExportButtonExport',
text: _('ID_EXPORT'),
handler: Export.submit
},{
id: 'windowConfigExportButtonCancel',
text: _('ID_CANCEL'),
handler: function(){
Export.window.hide();

13
workflow/engine/templates/pmTables/list.js
View File

@@ -62,12 +62,14 @@ Ext.onReady(function(){
}
newButton = new Ext.Action({
id: 'newButton',
text: _('ID_NEW'),
icon: '/images/add-table.png',
menu: newMenuOptions
});
editButton = new Ext.Action({
id: 'editButton',
text: _('ID_EDIT'),
icon: '/images/edit-table.png',
handler: EditPMTable,
@@ -75,6 +77,7 @@ Ext.onReady(function(){
});
deleteButton = new Ext.Action({
id: 'deleteButton',
text: _('ID_DELETE'),
icon: '/images/delete-table.png',
handler: DeletePMTable,
@@ -82,6 +85,7 @@ Ext.onReady(function(){
});
importButton = new Ext.Action({
id: 'importButton',
text: _('ID_IMPORT'),
iconCls: 'silk-add',
icon: '/images/import.gif',
@@ -89,6 +93,7 @@ Ext.onReady(function(){
});
exportButton = new Ext.Action({
id: 'exportButton',
text: _('ID_EXPORT'),
iconCls: 'silk-add',
icon: '/images/export.png',
@@ -97,6 +102,7 @@ Ext.onReady(function(){
});
dataButton = new Ext.Action({
id: 'dataButton',
text: '&nbsp;' + _('ID_DATA'),
iconCls: 'silk-add',
icon: '/images/database-start.png',
@@ -105,6 +111,7 @@ Ext.onReady(function(){
});
searchButton = new Ext.Action({
id: 'searchButton',
text: _('ID_SEARCH'),
handler: DoSearch
});
@@ -162,6 +169,7 @@ Ext.onReady(function(){
});
clearTextButton = new Ext.Action({
id: 'clearTextButton',
text: 'X',
ctCls:'pm_search_x_button',
handler: GridByDefault
@@ -174,6 +182,7 @@ Ext.onReady(function(){
});
comboPageSize = new Ext.form.ComboBox({
id: 'comboPageSize',
typeAhead : false,
mode : 'local',
triggerAction : 'all',
@@ -306,6 +315,7 @@ Ext.onReady(function(){
});
bbarpaging = new Ext.PagingToolbar({
id: 'bbarpaging',
pageSize: pageSize,
store: store,
displayInfo: true,
@@ -531,12 +541,14 @@ ImportPMTable = function(){
iconCls: 'upload-icon'
}
}, {
id: 'importPMTableOverwrite',
xtype: 'checkbox',
fieldLabel: '',
boxLabel: _('ID_OVERWRITE_EXIST'), // 'Overwrite if exists?',
name: 'form[OVERWRITE]'
}],
buttons: [{
id: 'importPMTableButtonUpload',
text: _('ID_UPLOAD'),
handler: function(){
var uploader = Ext.getCmp('uploader');
@@ -598,6 +610,7 @@ ImportPMTable = function(){
uploader.getForm().reset();
}
}*/,{
id: 'importPMTableButtonCancel',
text: TRANSLATIONS.ID_CANCEL,
handler: function(){
w.close();