BUG 0000 Added field title in Dashboards

- Added field title for to opcion "new" and "edit" dashlet - Added field title in list of dashlets - Added title value in DASHLET_INSTANCE.DAS_INS_ADDITIONAL_PROPERTIES field, this in "inser.sql" file
2012-03-23 16:40:52 -04:00
parent d301830c8c
commit 5115a9fa13
5 changed files with 45 additions and 9 deletions
--- a/workflow/engine/classes/class.pmDashlet.php
+++ b/workflow/engine/classes/class.pmDashlet.php
@@ -94,7 +94,11 @@ class PMDashlet extends DashletInstance implements DashletInterface {
      $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
      $dataset->next();
      while ($row = $dataset->getRow()) {
+        $arrayField = unserialize($row["DAS_INS_ADDITIONAL_PROPERTIES"]);
+        
        $row['DAS_INS_STATUS_LABEL'] = ($row['DAS_INS_STATUS'] == '1' ? G::LoadTranslation('ID_ACTIVE') : G::LoadTranslation('ID_INACTIVE'));
+        $row["DAS_INS_TITLE"] = (isset($arrayField["DAS_INS_TITLE"]) && !empty($arrayField["DAS_INS_TITLE"]))? $arrayField["DAS_INS_TITLE"] : "";
+        
        switch ($row['DAS_INS_OWNER_TYPE']) {
          case 'EVERYBODY':
            $row['DAS_INS_OWNER_TITLE'] = G::LoadTranslation('ID_ALL_USERS');
@@ -183,6 +187,7 @@ class PMDashlet extends DashletInstance implements DashletInterface {
      // Check for "public" dashlets
      $criteria = new Criteria('workflow');
      $criteria->addSelectColumn(DashletInstancePeer::DAS_INS_UID);
+      $criteria->addSelectColumn(DashletInstancePeer::DAS_INS_ADDITIONAL_PROPERTIES);
      $criteria->addSelectColumn(DashletPeer::DAS_CLASS);
      $criteria->addSelectColumn(DashletPeer::DAS_TITLE);
      $criteria->addJoin(DashletInstancePeer::DAS_UID, DashletPeer::DAS_UID, Criteria::INNER_JOIN);
@@ -192,7 +197,11 @@ class PMDashlet extends DashletInstance implements DashletInterface {
      $dataset->next();
      while ($row = $dataset->getRow()) {
        if (!isset($dashletsInstances[$row['DAS_INS_UID']])) {
+          $arrayField = unserialize($row["DAS_INS_ADDITIONAL_PROPERTIES"]);
+          
          $row['DAS_XTEMPLATE'] = $this->getXTemplate($row['DAS_CLASS']);
+          $row["DAS_TITLE"] = (isset($arrayField["DAS_INS_TITLE"]) && !empty($arrayField["DAS_INS_TITLE"]))? $arrayField["DAS_INS_TITLE"] : $row["DAS_TITLE"];
+          
          $dashletsInstances[$row['DAS_INS_UID']] = $row;
        }
        $dataset->next();
@@ -201,6 +210,7 @@ class PMDashlet extends DashletInstance implements DashletInterface {
      $usersInstance = new Users();
      $criteria = new Criteria('workflow');
      $criteria->addSelectColumn(DashletInstancePeer::DAS_INS_UID);
+      $criteria->addSelectColumn(DashletInstancePeer::DAS_INS_ADDITIONAL_PROPERTIES);
      $criteria->addSelectColumn(DashletPeer::DAS_CLASS);
      $criteria->addSelectColumn(DashletPeer::DAS_TITLE);
      $criteria->addJoin(DashletInstancePeer::DAS_UID, DashletPeer::DAS_UID, Criteria::INNER_JOIN);
@@ -211,7 +221,11 @@ class PMDashlet extends DashletInstance implements DashletInterface {
      $dataset->next();
      while ($row = $dataset->getRow()) {
        if (!isset($dashletsInstances[$row['DAS_INS_UID']])) {
+          $arrayField = unserialize($row["DAS_INS_ADDITIONAL_PROPERTIES"]);
+          
          $row['DAS_XTEMPLATE'] = $this->getXTemplate($row['DAS_CLASS']);
+          $row["DAS_TITLE"] = (isset($arrayField["DAS_INS_TITLE"]) && !empty($arrayField["DAS_INS_TITLE"]))? $arrayField["DAS_INS_TITLE"] : $row["DAS_TITLE"];
+          
          $dashletsInstances[$row['DAS_INS_UID']] = $row;
        }
        $dataset->next();
@@ -222,6 +236,7 @@ class PMDashlet extends DashletInstance implements DashletInterface {
      foreach ($departments as $depUid => $department) {
        $criteria = new Criteria('workflow');
        $criteria->addSelectColumn(DashletInstancePeer::DAS_INS_UID);
+        $criteria->addSelectColumn(DashletInstancePeer::DAS_INS_ADDITIONAL_PROPERTIES);
        $criteria->addSelectColumn(DashletPeer::DAS_CLASS);
        $criteria->addSelectColumn(DashletPeer::DAS_TITLE);
        $criteria->addJoin(DashletInstancePeer::DAS_UID, DashletPeer::DAS_UID, Criteria::INNER_JOIN);
@@ -232,7 +247,11 @@ class PMDashlet extends DashletInstance implements DashletInterface {
        $dataset->next();
        while ($row = $dataset->getRow()) {
          if (!isset($dashletsInstances[$row['DAS_INS_UID']])) {
+            $arrayField = unserialize($row["DAS_INS_ADDITIONAL_PROPERTIES"]);
+            
            $row['DAS_XTEMPLATE'] = $this->getXTemplate($row['DAS_CLASS']);
+            $row["DAS_TITLE"] = (isset($arrayField["DAS_INS_TITLE"]) && !empty($arrayField["DAS_INS_TITLE"]))? $arrayField["DAS_INS_TITLE"] : $row["DAS_TITLE"];
+            
            $dashletsInstances[$row['DAS_INS_UID']] = $row;
          }
          $dataset->next();
@@ -245,6 +264,7 @@ class PMDashlet extends DashletInstance implements DashletInterface {
      foreach ($groups as $grpUid => $group) {
        $criteria = new Criteria('workflow');
        $criteria->addSelectColumn(DashletInstancePeer::DAS_INS_UID);
+        $criteria->addSelectColumn(DashletInstancePeer::DAS_INS_ADDITIONAL_PROPERTIES);
        $criteria->addSelectColumn(DashletPeer::DAS_CLASS);
        $criteria->addSelectColumn(DashletPeer::DAS_TITLE);
        $criteria->addJoin(DashletInstancePeer::DAS_UID, DashletPeer::DAS_UID, Criteria::INNER_JOIN);
@@ -255,7 +275,11 @@ class PMDashlet extends DashletInstance implements DashletInterface {
        $dataset->next();
        while ($row = $dataset->getRow()) {
          if (!isset($dashletsInstances[$row['DAS_INS_UID']])) {
+            $arrayField = unserialize($row["DAS_INS_ADDITIONAL_PROPERTIES"]);
+            
            $row['DAS_XTEMPLATE'] = $this->getXTemplate($row['DAS_CLASS']);
+            $row["DAS_TITLE"] = (isset($arrayField["DAS_INS_TITLE"]) && !empty($arrayField["DAS_INS_TITLE"]))? $arrayField["DAS_INS_TITLE"] : $row["DAS_TITLE"];
+            
            $dashletsInstances[$row['DAS_INS_UID']] = $row;
          }
          $dataset->next();
--- a/workflow/engine/data/mssql/insert.sql
+++ b/workflow/engine/data/mssql/insert.sql
@@ -61046,7 +61046,7 @@ SELECT '00000000000000000000000000000001','dashletOpenVSCompleted','Open Cases V
 SELECT '00000000000000000000000000000003','dashletProcessMakerEnterprise','ProcessMaker Enterprise Plugins and Addons','The following list of Enterprise plug-ins includes features and functionality that extend and enhance ProcessMaker performance and functionality.','1.0','2011-12-05 00:00:00','2011-12-05 00:00:00','1';

 INSERT INTO [DASHLET_INSTANCE] ([DAS_INS_UID],[DAS_UID],[DAS_INS_OWNER_TYPE],[DAS_INS_OWNER_UID],[DAS_INS_ADDITIONAL_PROPERTIES],[DAS_INS_CREATE_DATE],[DAS_INS_UPDATE_DATE],[DAS_INS_STATUS])
-SELECT '00000000000000000000000000000002','00000000000000000000000000000002','EVERYBODY','','','2011-12-02 00:00:00','2011-12-02 00:00:00',1 UNION ALL
-SELECT '00000000000000000000000000000001','00000000000000000000000000000001','EVERYBODY','','a:7:{s:20:"DAS_INS_CONTEXT_TIME";s:5:"TODAY";s:12:"DAS_RED_FROM";s:1:"0";s:10:"DAS_RED_TO";s:2:"30";s:15:"DAS_YELLOW_FROM";s:2:"30";s:13:"DAS_YELLOW_TO";s:2:"50";s:14:"DAS_GREEN_FROM";s:2:"50";s:12:"DAS_GREEN_TO";s:3:"100";}','2011-12-02 00:00:00','2011-12-02 00:00:00',1 UNION ALL
-SELECT '00000000000000000000000000000003','00000000000000000000000000000003','EVERYBODY','','','2011-12-05 00:00:00','2011-12-05 00:00:00',1;
+SELECT '00000000000000000000000000000002','00000000000000000000000000000002','EVERYBODY','','a:1:{s:13:"DAS_INS_TITLE";s:22:"ProcessMaker Community";}','2011-12-02 00:00:00','2011-12-02 00:00:00',1 UNION ALL
+SELECT '00000000000000000000000000000001','00000000000000000000000000000001','EVERYBODY','','a:8:{s:13:"DAS_INS_TITLE";s:29:"Open Cases VS Completed Cases";s:20:"DAS_INS_CONTEXT_TIME";s:5:"TODAY";s:12:"DAS_RED_FROM";s:1:"0";s:10:"DAS_RED_TO";s:2:"30";s:15:"DAS_YELLOW_FROM";s:2:"30";s:13:"DAS_YELLOW_TO";s:2:"50";s:14:"DAS_GREEN_FROM";s:2:"50";s:12:"DAS_GREEN_TO";s:3:"100";}','2011-12-02 00:00:00','2011-12-02 00:00:00',1 UNION ALL
+SELECT '00000000000000000000000000000003','00000000000000000000000000000003','EVERYBODY','','a:1:{s:13:"DAS_INS_TITLE";s:42:"ProcessMaker Enterprise Plugins and Addons";}','2011-12-05 00:00:00','2011-12-05 00:00:00',1;

--- a/workflow/engine/data/mysql/insert.sql
+++ b/workflow/engine/data/mysql/insert.sql
@@ -59057,7 +59057,7 @@ INSERT INTO DASHLET (DAS_UID,DAS_CLASS,DAS_TITLE,DAS_DESCRIPTION,DAS_VERSION,DAS
 ('00000000000000000000000000000003','dashletProcessMakerEnterprise','ProcessMaker Enterprise Plugins and Addons','The following list of Enterprise plug-ins includes features and functionality that extend and enhance ProcessMaker performance and functionality.','1.0','2011-12-05 00:00:00','2011-12-05 00:00:00','1');

 INSERT INTO DASHLET_INSTANCE (DAS_INS_UID,DAS_UID,DAS_INS_OWNER_TYPE,DAS_INS_OWNER_UID,DAS_INS_ADDITIONAL_PROPERTIES,DAS_INS_CREATE_DATE,DAS_INS_UPDATE_DATE,DAS_INS_STATUS) VALUES 
-('00000000000000000000000000000002','00000000000000000000000000000002','EVERYBODY','','','2011-12-02 00:00:00','2011-12-02 00:00:00',1),
-('00000000000000000000000000000001','00000000000000000000000000000001','EVERYBODY','','a:7:{s:20:"DAS_INS_CONTEXT_TIME";s:5:"TODAY";s:12:"DAS_RED_FROM";s:1:"0";s:10:"DAS_RED_TO";s:2:"30";s:15:"DAS_YELLOW_FROM";s:2:"30";s:13:"DAS_YELLOW_TO";s:2:"50";s:14:"DAS_GREEN_FROM";s:2:"50";s:12:"DAS_GREEN_TO";s:3:"100";}','2011-12-02 00:00:00','2011-12-02 00:00:00',1),
-('00000000000000000000000000000003','00000000000000000000000000000003','EVERYBODY','','','2011-12-05 00:00:00','2011-12-05 00:00:00',1);
+('00000000000000000000000000000002','00000000000000000000000000000002','EVERYBODY','','a:1:{s:13:"DAS_INS_TITLE";s:22:"ProcessMaker Community";}','2011-12-02 00:00:00','2011-12-02 00:00:00',1),
+('00000000000000000000000000000001','00000000000000000000000000000001','EVERYBODY','','a:8:{s:13:"DAS_INS_TITLE";s:29:"Open Cases VS Completed Cases";s:20:"DAS_INS_CONTEXT_TIME";s:5:"TODAY";s:12:"DAS_RED_FROM";s:1:"0";s:10:"DAS_RED_TO";s:2:"30";s:15:"DAS_YELLOW_FROM";s:2:"30";s:13:"DAS_YELLOW_TO";s:2:"50";s:14:"DAS_GREEN_FROM";s:2:"50";s:12:"DAS_GREEN_TO";s:3:"100";}','2011-12-02 00:00:00','2011-12-02 00:00:00',1),
+('00000000000000000000000000000003','00000000000000000000000000000003','EVERYBODY','','a:1:{s:13:"DAS_INS_TITLE";s:42:"ProcessMaker Enterprise Plugins and Addons";}','2011-12-05 00:00:00','2011-12-05 00:00:00',1);

--- a/workflow/engine/templates/dashboard/dashletInstanceForm.js
+++ b/workflow/engine/templates/dashboard/dashletInstanceForm.js
@@ -5,6 +5,7 @@ var hiddenDasInsUID;
 var cboDasUID;
 var cboDasInsOwnerType;
 var cboDasInsOwnerUID;
+var txtDasInsTitle;
 var formFields;
 var additionalFields;
 var dashletInstanceFrm;
@@ -63,7 +64,7 @@ Ext.onReady(function() {
  cboDasUID = new Ext.form.ComboBox({
    id:             'cboDasUID',
    name:           'DAS_UID',
-    fieldLabel:     'Dashboard',
+    fieldLabel:     "Dashlet",
    editable:       false,
    width:          320,
    store:          storeDasUID,
@@ -152,12 +153,21 @@ Ext.onReady(function() {
    valueField:    'OWNER_UID',
    displayField:  'OWNER_NAME'
  });
+  
+  txtDasInsTitle = new Ext.form.TextField({
+    id: "txtDasInsTitle",
+    
+    name: "DAS_INS_TITLE",
+    fieldLabel: "Title",
+    allowBlank: false,
+    width: 320
+  });

  formFields = [
    new Ext.form.FieldSet({
      id:    'general',
      title: 'General',
-      items: [hiddenDasInsUID, cboDasUID, cboDasInsOwnerType, cboDasInsOwnerUID]
+      items: [txtDasInsTitle, hiddenDasInsUID, cboDasUID, cboDasInsOwnerType, cboDasInsOwnerUID]
    })
  ];

--- a/workflow/engine/templates/dashboard/dashletsList.js
+++ b/workflow/engine/templates/dashboard/dashletsList.js
@@ -151,6 +151,7 @@ Ext.onReady(function(){
      totalProperty: 'totalDashletsInstances',
      fields : [
        {name : 'DAS_INS_UID'},
+        {name : "DAS_INS_TITLE"},
        {name : 'DAS_TITLE'},
        {name : 'DAS_VERSION'},
        {name : 'DAS_INS_OWNER_TITLE'},
@@ -167,7 +168,8 @@ Ext.onReady(function(){
    },
    columns: [
      {id:'DAS_INS_UID', dataIndex: 'DAS_INS_UID', hidden:true, hideable:false},
-      {header: _('ID_NAME'), dataIndex: 'DAS_TITLE', width: 200, hidden:false, align:'left'},
+      {header: _("ID_TITLE"), dataIndex: "DAS_INS_TITLE", width: 150, hidden: false, align: "left"},
+      {header: "Dashlet", dataIndex: "DAS_TITLE", width: 200, hidden: false, align: "left"},
      {header: _('ID_VERSION'), dataIndex: 'DAS_VERSION', width: 60, hidden: false, align: 'center'},
      {header: _('ID_ASSIGNED_TO'), dataIndex: 'DAS_INS_OWNER_TITLE', width: 200, hidden: false, align: 'center'},
      {header: _('ID_UPDATE_DATE'), dataIndex: 'DAS_INS_UPDATE_DATE', width: 80, hidden: false, align: 'center'},