fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '2.0-dev' of git.colosa.net:processmaker into 2.0-dev

Browse Source
This commit is contained in:
Fernando Ontiveros
2011-10-31 22:15:34 -04:00
parent 12dae700d0 f76d0cfcd2
commit 387b8c9f66
9 changed files with 5193 additions and 4601 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
workflow/engine/classes/class.pmDashlet.php
View File

@@ -53,6 +53,18 @@ class PMDashlet extends DashletInstance implements DashletInterface {
$dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$dataset->next();
while ($row = $dataset->getRow()) {
$row['DAS_INS_STATUS_LABEL'] = ($row['DAS_INS_STATUS'] == '1' ? G::LoadTranslation('ID_ACTIVE') : G::LoadTranslation('ID_INACTIVE'));
switch ($row['DAS_INS_OWNER_TYPE']) {
case 'DEPARTMENT':
require_once 'classes/model/Department.php';
$departmentInstance = new Department();
$department = $departmentInstance->load($row['DAS_INS_OWNER_UID']);
$row['DAS_INS_OWNER_TITLE'] = $department['DEPO_TITLE'];
break;
default:
$row['DAS_INS_OWNER_TITLE'] = $row['DAS_INS_OWNER_TYPE'];
break;
}
$dashletsInstances[] = $row;
$dataset->next();
}
@@ -121,6 +133,7 @@ class PMDashlet extends DashletInstance implements DashletInterface {
$criteria = new Criteria('workflow');
$criteria->addSelectColumn(DashletInstancePeer::DAS_INS_UID);
$criteria->addSelectColumn(DashletPeer::DAS_TITLE);
$criteria->addSelectColumn(DashletInstancePeer::DAS_INS_CONTEXT_TIME);
$criteria->add(DashletInstancePeer::DAS_INS_OWNER_TYPE, 'DEPARTMENT');
$criteria->add(DashletInstancePeer::DAS_INS_OWNER_UID, $depUid);
$dataset = DashletInstancePeer::doSelectRS($criteria);
@@ -128,6 +141,7 @@ class PMDashlet extends DashletInstance implements DashletInterface {
$dataset->next();
while ($row = $dataset->getRow()) {
if (!isset($dashletsInstances[$row['DAS_INS_UID']])) {
$row['DAS_TITLE'] .= ' (' . $row['DAS_INS_CONTEXT_TIME'] . ')';
$dashletsInstances[$row['DAS_INS_UID']] = $row;
}
$dataset->next();

5
workflow/engine/classes/model/DashletInstance.php
View File

@@ -34,12 +34,17 @@ class DashletInstance extends BaseDashletInstance {
$connection = Propel::getConnection(DashletInstancePeer::DATABASE_NAME);
try {
if (!isset($data['DAS_INS_UID'])) {
$data['DAS_INS_UID'] = '';
}
if ($data['DAS_INS_UID'] == '') {
$data['DAS_INS_UID'] = G::generateUniqueID();
$data['DAS_INS_CREATE_DATE'] = date('Y-m-d H:i:s');
$dashletInstance = new DashletInstance();
}
else {
$dashletInstance = DashletInstancePeer::retrieveByPK($data['DAS_INS_UID']);
}
$data['DAS_INS_UPDATE_DATE'] = date('Y-m-d H:i:s');
$dashletInstance->fromArray($data, BasePeer::TYPE_FIELDNAME);
if ($dashletInstance->validate()) {
$connection->begin();

106
workflow/engine/content/translations/english/processmaker.en.po
View File

@@ -1,8 +1,8 @@
msgid ""
msgstr ""
"Project-Id-Version: ProcessMaker (Branch 2.0) 2.0.34.rc6-4-gfd7334a\n"
"Project-Id-Version: ProcessMaker (Branch 2.0-dev) 2.0.34.rc4-58-g8068f7d\n"
"POT-Creation-Date: \n"
"PO-Revision-Date: 2011-10-26 09:47:45\n"
"PO-Revision-Date: 2011-10-31 21:41:24\n"
"Last-Translator: \n"
"Language-Team: Colosa Developers Team <developers@colosa.com>\n"
"MIME-Version: 1.0\n"
@@ -1378,8 +1378,8 @@ msgstr "Are you sure you want to remove this user or group?"
# TRANSLATION
# LABEL/ID_DASHBOARD
#: LABEL/ID_DASHBOARD
msgid "DASHBOARD"
msgstr "DASHBOARD"
msgid "Dashboards"
msgstr "Dashboards"
# TRANSLATION
# LABEL/ID_MSG_CONFIRM_REMOVE_TRIGGER
@@ -11269,6 +11269,48 @@ msgstr "Hide Process Information"
msgid "New Case Panel"
msgstr "New Case Panel"
# TRANSLATION
# LABEL/ID_BASE_DN
#: LABEL/ID_BASE_DN
msgid "Base DN"
msgstr "Base DN"
# TRANSLATION
# LABEL/ID_ANONYMOUS
#: LABEL/ID_ANONYMOUS
msgid "Anonymous"
msgstr "Anonymous"
# TRANSLATION
# LABEL/ID_IDENTIFIER_IMPORT_USER
#: LABEL/ID_IDENTIFIER_IMPORT_USER
msgid "Identifier for an imported user"
msgstr "Identifier for an imported user"
# TRANSLATION
# LABEL/ID_SEARCH_USER
#: LABEL/ID_SEARCH_USER
msgid "Search User"
msgstr "Search User"
# TRANSLATION
# LABEL/ID_OBJECT_CLASS
#: LABEL/ID_OBJECT_CLASS
msgid "Object Classes"
msgstr "Object Classes"
# TRANSLATION
# LABEL/ID_ADDITIONAL_FILTER
#: LABEL/ID_ADDITIONAL_FILTER
msgid "Additional Filter"
msgstr "Additional Filter"
# TRANSLATION
# LABEL/ID_ATTRIBUTES
#: LABEL/ID_ATTRIBUTES
msgid "Attributes"
msgstr "Attributes"
# additionalTables/additionalTablesData.xml?ADD_TAB_NAME
# additionalTables/additionalTablesData.xml
#: text - ADD_TAB_NAME
@@ -12286,13 +12328,13 @@ msgstr "3"
# authSources/ldapEdit.xml?AUTH_SOURCE_BASE_DN
# authSources/ldapEdit.xml
#: text - AUTH_SOURCE_BASE_DN
msgid "Base DN"
msgid "[authSources/ldapEdit.xml?AUTH_SOURCE_BASE_DN] Base DN"
msgstr "Base DN"
# authSources/ldapEdit.xml?AUTH_ANONYMOUS
# authSources/ldapEdit.xml
#: dropdown - AUTH_ANONYMOUS
msgid "Anonymous"
msgid "[authSources/ldapEdit.xml?AUTH_ANONYMOUS] Anonymous"
msgstr "Anonymous"
# authSources/ldapEdit.xml?AUTH_ANONYMOUS-
@@ -12310,7 +12352,7 @@ msgstr "Yes"
# authSources/ldapEdit.xml?AUTH_SOURCE_SEARCH_USER
# authSources/ldapEdit.xml
#: text - AUTH_SOURCE_SEARCH_USER
msgid "Search User"
msgid "[authSources/ldapEdit.xml?AUTH_SOURCE_SEARCH_USER] Search User"
msgstr "Search User"
# authSources/ldapEdit.xml?AUTH_SOURCE_PASSWORD
@@ -12322,25 +12364,25 @@ msgstr "Password"
# authSources/ldapEdit.xml?AUTH_SOURCE_IDENTIFIER_FOR_USER
# authSources/ldapEdit.xml
#: text - AUTH_SOURCE_IDENTIFIER_FOR_USER
msgid "Identifier for an imported user"
msgid "[authSources/ldapEdit.xml?AUTH_SOURCE_IDENTIFIER_FOR_USER] Identifier for an imported user"
msgstr "Identifier for an imported user"
# authSources/ldapEdit.xml?AUTH_SOURCE_OBJECT_CLASSES
# authSources/ldapEdit.xml
#: textarea - AUTH_SOURCE_OBJECT_CLASSES
msgid "Object Classes"
msgid "[authSources/ldapEdit.xml?AUTH_SOURCE_OBJECT_CLASSES] Object Classes"
msgstr "Object Classes"
# authSources/ldapEdit.xml?AUTH_SOURCE_ADDITIONAL_FILTER
# authSources/ldapEdit.xml
#: text - AUTH_SOURCE_ADDITIONAL_FILTER
msgid "Additional Filter"
msgid "[authSources/ldapEdit.xml?AUTH_SOURCE_ADDITIONAL_FILTER] Additional Filter"
msgstr "Additional Filter"
# authSources/ldapEdit.xml?AUTH_SOURCE_ATTRIBUTES
# authSources/ldapEdit.xml
#: textarea - AUTH_SOURCE_ATTRIBUTES
msgid "Attributes"
msgid "[authSources/ldapEdit.xml?AUTH_SOURCE_ATTRIBUTES] Attributes"
msgstr "Attributes"
# authSources/ldapEdit.xml?btnSave
@@ -17047,42 +17089,6 @@ msgstr "Completed"
msgid "[cases/cases_advancedSearchFilter.xml?FILTER] Filter"
msgstr "Filter"
# dashboard/dashboard_AvailableDashboards.xml?TITLE
# dashboard/dashboard_AvailableDashboards.xml
#: title - TITLE
msgid "Add availables reports or charts"
msgstr "Add availables reports or charts"
# dashboard/dashboard_AvailableDashboards.xml?DASHBOARD
# dashboard/dashboard_AvailableDashboards.xml
#: dropdown - DASHBOARD
msgid "Chart or Report"
msgstr "Chart or Report"
# dashboard/dashboard_AvailableDashboards.xml?BTN_CANCEL
# dashboard/dashboard_AvailableDashboards.xml
#: button - BTN_CANCEL
msgid "[dashboard/dashboard_AvailableDashboards.xml?BTN_CANCEL] Cancel"
msgstr "Cancel"
# dashboard/dashboard_AvailableDashboards.xml?ADD
# dashboard/dashboard_AvailableDashboards.xml
#: button - ADD
msgid "[dashboard/dashboard_AvailableDashboards.xml?ADD] Add"
msgstr "Add"
# dashboard/dashboard_NoAvailableDashboards.xml?TITLE
# dashboard/dashboard_NoAvailableDashboards.xml
#: title - TITLE
msgid "No availables reports or charts"
msgstr "No availables reports or charts"
# dashboard/dashboard_NoAvailableDashboards.xml?CLOSE
# dashboard/dashboard_NoAvailableDashboards.xml
#: button - CLOSE
msgid "[dashboard/dashboard_NoAvailableDashboards.xml?CLOSE] Close"
msgstr "Close"
# dbConnections/dbConnections.xml?DBS_TYPE
# dbConnections/dbConnections.xml
#: text - DBS_TYPE
@@ -30983,12 +30989,6 @@ msgstr "Behaviour"
msgid "Max. Length"
msgstr "Max. Length"
# dynaforms/fields/currency.xml?PME_CURRENCY
# dynaforms/fields/currency.xml
#: text - PME_CURRENCY
msgid "[dynaforms/fields/currency.xml?PME_CURRENCY] Currency"
msgstr "Currency"
# dynaforms/fields/currency.xml?PME_VALIDATE
# dynaforms/fields/currency.xml
#: dropdown - PME_VALIDATE

3
workflow/engine/controllers/dashboard.php
View File

@@ -44,7 +44,7 @@ class Dashboard extends Controller {
$width = 300;
}
else {
$width = $_REQUEST['w']-10;
$width = $_REQUEST['w'];
}
$this->pmDashlet->render( $width);
}
@@ -119,6 +119,7 @@ class Dashboard extends Controller {
}
catch (Exception $error) {
//ToDo: Display a error message
error_log($error->getMessage());
}
}

3766
workflow/engine/data/mssql/insert.sql
View File

File diff suppressed because it is too large Load Diff

3761
workflow/engine/data/mysql/insert.sql
View File

File diff suppressed because it is too large Load Diff

115
workflow/engine/methods/dashboard/dashletInstance.php Normal file
View File

@@ -0,0 +1,115 @@
<?php
try {
require_once ("classes/model/Content.php");
require_once ("classes/model/Dashlet.php");
require_once ("classes/model/Users.php");
require_once ("classes/model/Department.php");
G::LoadInclude("ajax");
//$option = $_POST["option"];
$option = get_ajax_value("option");
switch ($option) {
case "OWNERTYPE": $type = get_ajax_value("type");
switch ($type) {
case "USER": //
break;
case "DEPARTMENT": $department = array();
$oCriteria = new Criteria("workflow");
$del = DBAdapter::getStringDelimiter();
/*
SELECT
DISTINCT
DEPARTMENT.DEP_UID,
CONTENT.CON_VALUE
FROM
DEPARTMENT AS DEP
LEFT JOIN CONTENT ON (DEPARTMENT.DEP_UID = CONTENT.CON_ID AND CONTENT.CON_CATEGORY = 'DYN_TITLE' AND CONTENT.CON_LANG = 'en')
WHERE
DEPARTMENT.DEP_STATUS = 'ACTIVE'
ORDER BY CONTENT.CON_VALUE ASC
*/
//SELECT
$oCriteria->setDistinct();
$oCriteria->addSelectColumn(DepartmentPeer::DEP_UID);
$oCriteria->addSelectColumn(ContentPeer::CON_VALUE);
//FROM
$aConditions = array();
$aConditions[] = array(DepartmentPeer::DEP_UID, ContentPeer::CON_ID);
$aConditions[] = array(ContentPeer::CON_CATEGORY, $del . "DEPO_TITLE" . $del);
$aConditions[] = array(ContentPeer::CON_LANG, $del . "en" . $del);
$oCriteria->addJoinMC($aConditions, Criteria::LEFT_JOIN);
//WHERE
$oCriteria->add(DepartmentPeer::DEP_STATUS, "ACTIVE");
//ORDER BY X ASC
$oCriteria->addAscendingOrderByColumn(ContentPeer::CON_VALUE);
$departmentNumRows = DepartmentPeer::doCount($oCriteria);
$oDataset = DepartmentPeer::doSelectRS($oCriteria);
$oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
while ($oDataset->next()) {
$row = $oDataset->getRow();
$departmentUID = $row["DEP_UID"];
$depName = $row["CON_VALUE"];
$department[] = array("TABLE_UID" => $departmentUID, "TABLE_NAME" => $depName);
}
echo G::json_encode(array("success" => true, "resultTotal" => $departmentNumRows, "resultRoot" => $department));
break;
}
break;
case "DASHLST": $dashlet = array();
$oCriteria = new Criteria("workflow");
//SELECT
//$oCriteria->setDistinct();
$oCriteria->addSelectColumn(DashletPeer::DAS_UID);
$oCriteria->addSelectColumn(DashletPeer::DAS_TITLE);
//FROM
//WHERE
//ORDER BY X ASC
$oCriteria->addAscendingOrderByColumn(DashletPeer::DAS_TITLE);
//echo "<hr />" . $oCriteria->toString() . "<hr />";
//query
//doCount(Criteria $criteria, $distinct = false, $con = null)
$dashletNumRows = DashletPeer::doCount($oCriteria);
$oDataset = DashletPeer::doSelectRS($oCriteria);
$oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
while ($oDataset->next()) {
$row = $oDataset->getRow();
$dashletUID = $row["DAS_UID"];
$dashTitle = $row["DAS_TITLE"];
$dashlet[] = array("DAS_UID" => $dashletUID, "DAS_TITLE" => $dashTitle);
}
//echo "{users: " . G::json_encode($rows) . ", total_users: " . $totalRows . "}";
//echo json_encode(array("success" => true, "resultTotal" => $dashletNumRows, "resultRoot" => $dashlet));
echo G::json_encode(array("success" => true, "resultTotal" => $dashletNumRows, "resultRoot" => $dashlet));
break;
}
}
catch (Exception $oException) {
echo $oException->getMessage();
exit(0);
}
?>

445
workflow/engine/templates/dashboard/dashletInstanceForm.js
View File

@@ -1 +1,444 @@
alert('dashletInstanceForm');
Ext.namespace("dashletInstance");
dashletInstance.form = {
init: function () {
var URL_DASHLET_INSTANCE = "dashletInstance";
dashletInstanceSaveProcessAjax = function () {
var myMask = new Ext.LoadMask(Ext.getBody(), {msg: "Saving. Please wait..."});
myMask.show();
Ext.MessageBox.alert("", hiddenDasInsUID.getValue()+"------");
Ext.Ajax.request({
url: "saveDashletInstance",
method: "POST",
params:{"DAS_INS_UID": hiddenDasInsUID.getValue(),
"DAS_UID": cboDasUID.getValue(),
"DAS_INS_TYPE": cboDasInsType.getValue(),
"DAS_INS_CONTEXT_TIME": cboDasInsContextTime.getValue(),
//"DAS_INS_START_DATE": txtDasInsStartDate.getValue().format(txtDasInsStartDate.format),
//"DAS_INS_END_DATE": txtDasInsEndDate.getValue().format(txtDasInsEndDate.format),
"DAS_INS_OWNER_TYPE": cboDasInsOwnerType.getValue(),
"DAS_INS_OWNER_UID": cboDasInsOwnerUID.getValue()
//,
//"DAS_INS_PROCESSES": cboProcess.getValue(),
//"DAS_INS_TASKS": cboTask.getValue()
},
success:function (result, request) {
myMask.hide();
var dataResponse = Ext.util.JSON.decode(result.responseText)
switch (dataResponse.status) {
case "OK": //Ext.MessageBox.alert("Message", "Dashboard Instance registered correctly");
window.location.href = "dashletsList";
break;
default: Ext.MessageBox.alert("Alert", "Dashboard Instance registered failed");
break;
}
},
failure:function (result, request) {
myMask.hide();
Ext.MessageBox.alert("Alert", "Ajax communication failed");
}
});
}
dashletInstanceFrmLoad = function () {
if (dashletInstance.DAS_INS_UID) {
/*
"DAS_INS_UID": "",
"DAS_UID": cboDasUID.getValue(),
"DAS_INS_TYPE": cboDasInsType.getValue(),
"DAS_INS_CONTEXT_TIME": cboDasInsContextTime.getValue(),
//"DAS_INS_START_DATE": txtDasInsStartDate.getValue().format(txtDasInsStartDate.format),
//"DAS_INS_END_DATE": txtDasInsEndDate.getValue().format(txtDasInsEndDate.format),
"DAS_INS_OWNER_TYPE": cboDasInsOwnerType.getValue(),
"DAS_INS_OWNER_UID": cboDasInsOwnerUID.getValue()
//,
//"DAS_INS_PROCESSES": cboProcess.getValue(),
//"DAS_INS_TASKS": cboTask.getValue()
var index = store.find(valueField, value, false);
if (index < 0) return;
//Get model data id
var dataId = store.getAt(index).data.Id;
//Set combobox value and fire OnSelect event
combobox.setValueAndFireSelect(dataId);
*/
hiddenDasInsUID.setValue(dashletInstance.DAS_INS_UID)
cboDasUID.setValue(dashletInstance.DAS_UID);
cboDasInsType.setValue(dashletInstance.DAS_INS_TYPE);
cboDasInsContextTime.setValue(dashletInstance.DAS_INS_CONTEXT_TIME);
cboDasInsOwnerType.setValue(dashletInstance.DAS_INS_OWNER_TYPE);
//cboDasInsOwnerUID.setValue(dashletInstance.DAS_INS_OWNER_UID);
/*
var record = cboDasInsOwnerUID.findRecord(cboDasInsOwnerUID.valueField, dashletInstance.DAS_INS_OWNER_UID);
var index = cboDasInsOwnerUID.store.indexOf(record);
*/
//var index = storeDasInsOwnerUID.find(cboDasInsOwnerUID.valueField, dashletInstance.DAS_INS_OWNER_UID, false);
var dataId = storeDasInsOwnerUID.getAt(index).data.TABLE_UID;
var record = cboDasInsOwnerUID.findRecord(cboDasInsOwnerUID.valueField, dashletInstance.DAS_INS_OWNER_UID);
var index = cboDasInsOwnerUID.store.indexOf(record);
var dataId = storeDasInsOwnerUID.getAt(index).data.TABLE_UID;
//cboDasInsOwnerUID.setValueAndFireSelect(dataId);
cboDasInsOwnerUID.setValue(dataId);
//selectByValue(dashletInstance.DAS_INS_OWNER_UID, Boolean scrollIntoView ) : Boolean
}
}
//------------------------------------------------------------------------------------------------------------------
var storeDasUID = new Ext.data.Store({
proxy: new Ext.data.HttpProxy({
url: URL_DASHLET_INSTANCE,
method: "POST"
}),
baseParams: {"option": "DASHLST"},
reader: new Ext.data.JsonReader({
totalProperty: "resultTotal",
root: "resultRoot",
fields:[{name: "DAS_UID", type: "string"},
{name: "DAS_TITLE", type: "string"}
]
}),
autoLoad: true, //First call
listeners: {
load: function (store, record, option) {
cboDasUID.setValue(store.getAt(0).get(cboDasUID.valueField));
}
}
});
var storeDasInsType = new Ext.data.ArrayStore({
idIndex: 0, //definimos la posicion del ID de cada registro
fields: ["id", "value"],
data: [["OPEN_CASES", "Open Cases"]
]
});
var storeDasInsContextTime = new Ext.data.ArrayStore({
idIndex: 0,
fields: ["id", "value"],
data: [//["RANGE", "Date Ranges"],
["MONTH", "Month"],
["TODAY", "Today"],
["YESTERDAY", "Yesterday"],
["THIS_WEEK", "This Week"],
["PREVIOUS_WEEK", "Previous Week"],
["THIS_MONTH", "This Month"],
["PREVIOUS_MONTH", "Previous Month"],
["THIS_QUARTER", "This Quarter"],
["PREVIOUS_QUARTER", "Previous Quarter"],
["THIS_YEAR", "This Year"],
["PREVIOUS_YEAR", "Previous Year"]
]
});
var storeDasInsOwnerType = new Ext.data.ArrayStore({
idIndex: 0,
fields: ["id", "value"],
data: [//["USER", "User"],
["DEPARTMENT", "Department"]
]
});
var storeDasInsOwnerUID = new Ext.data.Store({
proxy: new Ext.data.HttpProxy({
url: URL_DASHLET_INSTANCE,
method: "POST"
}),
reader: new Ext.data.JsonReader({
totalProperty: "resultTotal",
root: "resultRoot",
fields:[{name: "TABLE_UID", type: "string"},
{name: "TABLE_NAME", type: "string"}
]
}),
autoLoad: true, //First call
listeners: {
beforeload: function (store) {
storeDasInsOwnerUID.baseParams = {"option": "OWNERTYPE",
"type": cboDasInsOwnerType.getValue()
};
},
load: function (store, record, option) {
cboDasInsOwnerUID.setValue(store.getAt(0).get(cboDasInsOwnerUID.valueField));
}
}
});
var storeProcess = new Ext.data.ArrayStore({
idIndex: 0,
fields: ["id", "value"],
data: [["ALL", "All"]
//,
//["SEL", "Selection"]
]
});
var storeTask = new Ext.data.ArrayStore({
idIndex: 0,
fields: ["id", "value"],
data: [["ALL", "All"]
//,
//["SEL", "Selection"]
]
});
//------------------------------------------------------------------------------------------------------------------
var hiddenDasInsUID = new Ext.form.Hidden({
id: "hiddenDasInsUID",
name: "DAS_INS_UID"
});
var cboDasUID = new Ext.form.ComboBox({
id: "cboDasUID",
name: "DAS_UID",
valueField: "DAS_UID",
displayField: "DAS_TITLE",
store: storeDasUID,
triggerAction: "all",
mode: "local",
editable: false,
width: 200,
fieldLabel: "Dashboard"
});
var cboDasInsType = new Ext.form.ComboBox({
id: "cboDasInsType",
name: "DAS_INS_TYPE",
valueField: "id",
displayField: "value",
value: "OPEN_CASES",
store: storeDasInsType,
triggerAction: "all",
mode: "local",
editable: false,
width: 200,
fieldLabel: "Type"
});
var cboDasInsContextTime = new Ext.form.ComboBox({
id: "cboDasInsContextTime",
name: "DAS_INS_CONTEXT_TIME",
valueField: "id",
displayField: "value",
value: "MONTH",
store: storeDasInsContextTime,
triggerAction: "all",
mode: "local",
editable: false,
width: 200,
fieldLabel: "Period"
});
var txtDasInsStartDate = new Ext.form.DateField({
id: "txtDasInsStartDate",
name: "DAS_INS_START_DATE",
value: new Date(2011, 0, 1), //january=0, february=1, etc
width: 100,
format: "Y/m/d",
editable: false,
fieldLabel: "Start Date"
});
var txtDasInsEndDate = new Ext.form.DateField({
id: "txtDasInsEndDate",
name: "DAS_INS_END_DATE",
value: new Date(2011, 0, 1),
width: 100,
format: "Y/m/d",
editable: false,
fieldLabel: "Finish Date"
});
var cboDasInsOwnerType = new Ext.form.ComboBox({
id: "cboDasInsOwnerType",
name: "DAS_INS_OWNER_TYPE",
valueField: "id",
displayField: "value",
value: "DEPARTMENT",
store: storeDasInsOwnerType,
triggerAction: "all",
mode: "local",
editable: false,
width: 200,
fieldLabel: "Owner Type",
listeners: {
select: function (combo, record, index) {
storeDasInsOwnerUID.baseParams = {"option": "OWNERTYPE",
"type": combo.getValue()
};
cboDasInsOwnerUID.store.load();
}
}
});
var cboDasInsOwnerUID = new Ext.form.ComboBox({
id: "cboDasInsOwnerUID",
name: "DAS_INS_OWNER_UID",
valueField: "TABLE_UID",
displayField: "TABLE_NAME",
store: storeDasInsOwnerUID,
triggerAction: "all",
mode: "local",
editable: false,
width: 200,
fieldLabel: "Assign To"
});
var cboProcess = new Ext.form.ComboBox({
id: "cboProcess",
name: "DAS_INS_PROCESSES",
valueField: "id",
displayField: "value",
value: "ALL",
store: storeProcess,
triggerAction: "all",
mode: "local",
editable: false,
width: 200,
fieldLabel: "Process"
});
var cboTask = new Ext.form.ComboBox({
id: "cboTask",
name: "DAS_INS_TASKS",
valueField: "id",
displayField: "value",
value: "ALL",
store: storeTask,
triggerAction: "all",
mode: "local",
editable: false,
width: 200,
fieldLabel: "Task"
});
//------------------------------------------------------------------------------------------------------------------
var dashletInstanceFrm = new Ext.form.FormPanel({
id: "dashletInstanceFrm",
style: "margin: 0 auto 0 auto;",
//labelAlign: "top",
labelWidth: 115, //The width of labels in pixels
bodyStyle: "padding:0.5em;",
border: true,
//cls: "class1",
width: 400,
//height: 400,
title: "New Dashboard Instance",
items: [hiddenDasInsUID,
cboDasUID,
cboDasInsType,
cboDasInsContextTime,
//txtDasInsStartDate,
//txtDasInsEndDate,
//cboDasInsOwnerType,
cboDasInsOwnerUID
//,
//cboProcess,
//cboTask
],
buttonAlign: "right",
buttons: [new Ext.Action({
id: "btnSubmit",
text: "Save",
//scope: this,
handler: function () {
dashletInstanceSaveProcessAjax();
}
}),
//{xtype: "button",
// id: "btnReset",
// text: "Reset",
// handler: function () {
// //Ext.getCmp("dashletInstanceFrm").getForm().reset();
// dashletInstanceFrm.getForm().reset();
// //cboProcess.store.load();
// }
//},
{xtype: "button",
id: "btnCancel",
text: "Cancel",
handler: function () {
window.location.href = "dashletsList";
}
}
]
});
//------------------------------------------------------------------------------------------------------------------
dashletInstanceFrmLoad();
//------------------------------------------------------------------------------------------------------------------
var pnlMain = new Ext.Panel({
id: "pnlMain",
region: "center",
margins: {top:3, right:3, bottom:3, left:0},
//bodyStyle: "padding:0.5em;", //propiedades ... //no aceptaba para la derecha
bodyStyle: "padding: 25px 25px 25px 25px;", //propiedades ...
border: false,
items: [dashletInstanceFrm]
});
//------------------------------------------------------------------------------------------------------------------
//LOAD ALL PANELS
var viewport = new Ext.Viewport({
layout:"fit",
items:[pnlMain]
});
}
}
Ext.onReady(dashletInstance.form.init, dashletInstance.form);

87
workflow/engine/templates/dashboard/dashletsList.js
View File

@@ -151,18 +151,13 @@ Ext.onReady(function(){
totalProperty: 'totalDashletsInstances',
fields : [
{name : 'DAS_INS_UID'},
{name : 'AUTH_SOURCE_NAME'},
{name : 'AUTH_SOURCE_PROVIDER'},
{name : 'AUTH_SOURCE_SERVER_NAME'},
{name : 'AUTH_SOURCE_PORT'},
{name : 'AUTH_SOURCE_ENABLED_TLS'},
{name : 'AUTH_SOURCE_VERSION'},
{name : 'AUTH_SOURCE_BASE_DN'},
{name : 'AUTH_ANONYMOUS'},
{name : 'AUTH_SOURCE_SEARCH_USER'},
{name : 'AUTH_SOURCE_ATTRIBUTES'},
{name : 'AUTH_SOURCE_OBJECT_CLASSES'},
{name : 'CURRENT_USERS', type:'int'}
{name : 'DAS_TITLE'},
{name : 'DAS_VERSION'},
{name : 'DAS_INS_TYPE'},
{name : 'DAS_INS_CONTEXT_TIME'},
{name : 'DAS_INS_OWNER_TITLE'},
{name : 'DAS_INS_UPDATE_DATE'},
{name : 'DAS_INS_STATUS_LABEL'}
]
})
});
@@ -174,11 +169,14 @@ Ext.onReady(function(){
},
columns: [
{id:'DAS_INS_UID', dataIndex: 'DAS_INS_UID', hidden:true, hideable:false},
{header: _('ID_NAME'), dataIndex: 'AUTH_SOURCE_NAME', width: 200, hidden:false, align:'left'},
{header: _('ID_PROVIDER'), dataIndex: 'AUTH_SOURCE_PROVIDER', width: 120, hidden: false, align: 'center'},
{header: _('ID_SERVER_NAME'), dataIndex: 'AUTH_SOURCE_SERVER_NAME', width: 180, hidden: false, align: 'center'},
{header: _('ID_PORT'), dataIndex: 'AUTH_SOURCE_PORT', width: 60, hidden: false, align: 'center'},
{header: _('ID_ACTIVE_USERS'), dataIndex: 'CURRENT_USERS', width: 90, hidden: false, align: 'center'}
{header: _('ID_NAME'), dataIndex: 'DAS_TITLE', width: 200, hidden:false, align:'left'},
{header: _('ID_VERSION'), dataIndex: 'DAS_VERSION', width: 60, hidden: false, align: 'center'},
{header: _('ID_TYPE'), dataIndex: 'DAS_INS_TYPE', width: 100, hidden: false, align: 'center'},
//{header: _('ID_PERIOD'), dataIndex: 'DAS_INS_CONTEXT_TIME', width: 100, hidden: false, align: 'center'},
{header: 'Period', dataIndex: 'DAS_INS_CONTEXT_TIME', width: 100, hidden: false, align: 'center'},
{header: _('ID_OWNER'), 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'},
{header: _('ID_STATUS'), dataIndex: 'DAS_INS_STATUS_LABEL', width: 60, hidden: false, align: 'center'}
]
});
@@ -199,7 +197,7 @@ Ext.onReady(function(){
editable: false,
listeners:{
select: function(c,d,i){
UpdatePageConfig(d.data['size']);
//UpdatePageConfig(d.data['size']);
bbarpaging.pageSize = parseInt(d.data['size']);
bbarpaging.moveFirst();
}
@@ -302,6 +300,14 @@ gridByDefault = function(){
infoGrid.store.load({params: {textFilter: searchText.getValue()}});
};*/
//Update Page Size Configuration
/*updatePageConfig = function(pageSize) {
Ext.Ajax.request({
url: 'updatePageConfig',
params: {size: pageSize}
});
};*/
//New Dashlet Instance Action
newDashletInstance = function() {
location.href = 'dashletInstanceForm';
@@ -311,54 +317,43 @@ newDashletInstance = function() {
editDashletInstance = function(){
var rowSelected = infoGrid.getSelectionModel().getSelected();
if (rowSelected){
location.href = 'dashletInstanceForm?dasInsUid=' + rowSelected.data.DAS_INS_UID;
location.href = 'dashletInstanceForm?DAS_INS_UID=' + rowSelected.data.DAS_INS_UID;
}
};
//Delete Dashlet Instance Action
deleteDashletInstance = function(){
var rowSelected = infoGrid.getSelectionModel().getSelected();
/*if (rowSelected){
if (rowSelected){
//Ext.Msg.confirm(_('ID_CONFIRM'), _('ID_CONFIRM_DELETE_DASHLET_INSTANCE'),function(btn, text)
Ext.Msg.confirm(_('ID_CONFIRM'), 'Do you want to delete this Dashlet Instance?', function(btn, text)
{
if (btn == 'yes') {
viewport.getEl().mask(_('ID_PROCESSING'));
Ext.Ajax.request({
url: 'deleteDashletInstance',
params: {dasInsUid: rowSelected.data.DAS_INS_UID},
success: function(r,o){
params: {DAS_INS_UID: rowSelected.data.DAS_INS_UID},
success: function(r, o){
viewport.getEl().unmask();
response = Ext.util.JSON.decode(r.responseText);
if (response.success){
Ext.Msg.confirm(_('ID_CONFIRM'),_('ID_CONFIRM_DELETE_DASHLET_INSTANCE'),function(btn,text){
if (btn=='yes'){
viewport.getEl().mask(_('ID_PROCESSING'));
Ext.Ajax.request({
url: 'deleteDashletInstance',
params: {dasInsUid : rowSelected.data.DAS_INS_UID},
success: function(r,o){
viewport.getEl().unmask();
resp = Ext.util.JSON.decode(r.responseText);
if (resp.success){
PMExt.notify(_('ID_DASHLET_INSTANCE'),_('ID_DASHLET_SUCCESS_DELETE'));
}else{
PMExt.error(_('ID_DASHLET_INSTANCE'),resp.error);
if (response.status == 'OK') {
//PMExt.notify(_('ID_DASHLET_INSTANCE'),_('ID_DASHLET_SUCCESS_DELETE'));
PMExt.notify('Dashlet Instance', 'Dashlet instance deleted sucessfully.');
}
else {
//PMExt.error(_('ID_DASHLET_INSTANCE'), response.message);
PMExt.error('Dashlet Instance', response.message);
}
//doSearch();
editButton.disable();
deleteButton.disable();
infoGrid.store.load();
},
failure: function(r,o){
failure: function(r, o){
viewport.getEl().unmask();
}
});
}
});
}else{
PMExt.error(_('ID_DASHLET_INSTANCE'),_('ID_MSG_CANNOT_DELETE_DASHLET'));
}
},
failure: function(r,o){
viewport.getEl().unmask();
}
});
}*/
};