Commit 82ce0d0f authored by Bas Lijnse's avatar Bas Lijnse

Small cosmetic changes in the GUI and bid example

git-svn-id: https://svn.cs.ru.nl/repos/iTask-system/branches/fancyTasks@363 63da3aa8-80fd-4f01-9db8-e6ea747a3da2
parent 1063019b
......@@ -11,7 +11,7 @@ itasks.WorkListPanel = Ext.extend(Ext.ux.grid.livegrid.GridPanel, {
autoLoad: true,
bufferSize: 300,
sortInfo: {
field: 'taskid',
field: 'subject',
direction: 'ASC'
},
proxy: new Ext.data.HttpProxy({
......@@ -22,12 +22,12 @@ itasks.WorkListPanel = Ext.extend(Ext.ux.grid.livegrid.GridPanel, {
totalProperty: 'total',
successProperty: 'success'
},[
{name: 'taskid'},
{name: 'subject'},
{name: 'processname'},
{name: 'delegatorName'},
{name: 'priority'},
{name: 'timestamp'},
{name: 'taskid'},
{name: 'tree_path'},
{name: 'tree_last'},
{name: 'tree_icon'}
......@@ -75,12 +75,12 @@ itasks.WorkListPanel = Ext.extend(Ext.ux.grid.livegrid.GridPanel, {
view: this.workView,
selModel: new Ext.ux.grid.livegrid.RowSelectionModel(),
columns: [
{id: 'taskid', header: 'Task', dataindex: 'taskid', renderer: treeRenderer, width: 200 },
{id: 'subject', header: 'Subject', dataIndex: 'subject', width: 100},
{id: 'processname', header: 'Process', dataindex: 'processname', width: 100},
{id: 'delegatorName', header: 'From', dataIndex: 'delegatorName', width: 100 },
{id: 'subject', header: 'Subject', dataindex: 'taskid', renderer: treeRenderer, width: 200 },
{id: 'processname', header: 'Workflow', dataindex: 'processname', width: 100},
{id: 'delegatorName', header: 'Delegated by', dataIndex: 'delegatorName', width: 100 },
{id: 'priority', header: 'Priority', dataindex: 'priority', renderer: itasks.util.formatPriority, width: 100 },
{id: 'timestamp', header: 'Date', dataIndex: 'timestamp', renderer: itasks.util.formatDate, width: 100}
{id: 'timestamp', header: 'Date', dataIndex: 'timestamp', renderer: itasks.util.formatDate, width: 100},
{id: 'taskid', header: 'Task nr', dataIndex: 'taskid', width: 100}
],
viewConfig: {
forceFit: true,
......
......@@ -152,7 +152,7 @@ itasks.WorkTabPanel = Ext.extend(Ext.Panel, {
if (data.error != null) {
this.autoClose(this.makeErrorMessage(data.error), 5);
} else if(data.status == 'TaskFinished') { //Check if the task is done
this.fireEvent('taskfinished', this.id);
//this.fireEvent('taskfinished', this.id); //TEMPORARY
this.autoClose(this.makeFinishedMessage(), 5);
} else if(data.status == 'TaskDeleted') {
this.fireEvent('taskdeleted', this.id);
......@@ -163,6 +163,9 @@ itasks.WorkTabPanel = Ext.extend(Ext.Panel, {
this.setupTracePanels(trace, data);
}
//TEMPORARY
this.fireEvent('taskfinished', this.id);
//Hide the current content panel and switch to new content
this.switchContentPanels(trace);
......@@ -275,7 +278,6 @@ itasks.WorkTabPanel = Ext.extend(Ext.Panel, {
},this);
}
input.on("focus", function (inp) {
alert("FOOCUSUUIS");
this.lastFocus = inp.name;
},this);
......
......@@ -49,7 +49,7 @@ selectSuppliers
collectBids :: String [(Int,String)] -> Task [((Int,String),Real)]
collectBids purchase suppliers
= andTasks
[("Bid from " +++ name, uid @: ("Bid request", collectBid purchase supplier)) \\ supplier =: (uid,name) <- suppliers]
[("Bid for " +++ purchase +++ " from " +++ name, uid @: ("Bid request regarding " +++ purchase, collectBid purchase supplier)) \\ supplier =: (uid,name) <- suppliers]
where
collectBid :: String (Int,String) -> Task ((Int,String),Real)
collectBid purchase bid
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment