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

2014-03-24 10:40:07 -04:00
parent 4dc4fa65dd 241dd9c3b6
commit 0f0659c069
11 changed files with 367 additions and 157 deletions
--- a/workflow/engine/src/BusinessModel/Cases.php
+++ b/workflow/engine/src/BusinessModel/Cases.php
@@ -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) {
--- a/workflow/engine/src/Tests/BusinessModel/CasesTest.php
+++ b/workflow/engine/src/Tests/BusinessModel/CasesTest.php
@@ -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));
+    }
+
 }

--- a/workflow/engine/templates/designer/index.html
+++ b/workflow/engine/templates/designer/index.html
@@ -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>
--- a/workflow/engine/templates/pmTables/editReport.js
+++ b/workflow/engine/templates/pmTables/editReport.js
@@ -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 : '') : '';
--- a/workflow/engine/templates/pmTables/export.js
+++ b/workflow/engine/templates/pmTables/export.js
@@ -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();
--- a/workflow/engine/templates/pmTables/list.js
+++ b/workflow/engine/templates/pmTables/list.js
@@ -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();