Navigation

← Previous Changeset
Next Changeset →

Changeset 17800

Timestamp:

07/30/08 13:11:03 (1 month ago)

Author:

ritesh

Message:

Improvement in Assignment filter UI.

Files:

trunk/core/src/net/project/view/pages/assignments/MyAssignments.java (modified) (3 diffs)
trunk/core/web/css/Multiselect.css (modified) (2 diffs)
trunk/core/web/css/editable-column-tree.css (modified) (2 diffs)
trunk/core/web/html/assignments/MyAssignments.html (modified) (1 diff)
trunk/core/web/images/default/search.gif (added)
trunk/core/web/src/components/myAssignmentFilter-form.js (modified) (1 diff)
trunk/core/web/src/components/myAssignments-dashboard.js (modified) (9 diffs)

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

trunk/core/src/net/project/view/pages/assignments/MyAssignments.java

r17797	r17800
152	152	if(action != null){
153	153	if(action.equalsIgnoreCase("setFilterParameter")){
154		setAllFil~~ert~~Parameter(request);
	154	setAllFilterParameter(request);
155	155	}
156	156	if(action.equalsIgnoreCase("getAssignmentsTreeData")){
…	…
259	259	if(!projectOptionsString.equals("[")){
260	260	projectOptionsString += ",";
	261	}else{
	262	projectOptionsString += "['','All'],";
261	263	}
262	264	projectOptionsString += "['"+ project.getProjectId()+"','"+ project.getProjectName() +"']";
…	…
266	268	}
267	269
268		private boolean setAllFil~~ert~~Parameter(HttpServletRequest request) {
	270	private boolean setAllFilterParameter(HttpServletRequest request) {
269	271	if (request.getParameter("assigneeOrAssignor") != null && request.getParameter("assigneeOrAssignor").equals("assignor")) {
270	272	setAssignor(true);

trunk/core/web/css/Multiselect.css

r17797	r17800
3	3	background:white;
4	4	position:relative; /* for calculating scroll offsets */
5		~~zoom:2;~~
	5	/zoom:2;/
6	6	overflow:auto;
7	7	}
…	…
14	14	}
15	15	.ux-mselect-selected{
16		border:3px ~~dotted~~ #a3bae9 !important;
	16	border:3px thin #a3bae9 !important;
17	17	background:#DFE8F6;
18	18	cursor:pointer;

trunk/core/web/css/editable-column-tree.css

r17768	r17800
6	6	* http://extjs.com/license
7	7	*/
8
	8	.x-date-middle {
	9	padding-top:2px;padding-bottom:2px;
	10	width:130px; /* FF3 */
	11	}
9	12	.x-column-tree .x-tree-node {
10	13	zoom:1;
…	…
76	79	background-image:url(../images/default/tree/project.gif) !important;
77	80	}
78
79
80		.message-div{
81		position: absolute;
82		visibility: hidden;
83		width: 500px;
84		height: 300px;
85		left: 290px;
86		top: 100px;
87		background-color: #FFFFFF;
88		border: 4px solid #99CCFF;
89		padding: 10px;
90		z-index: 100001;
	81	.filter-icon {
	82	background-image:url(../images/default/search.gif) !important;
91	83	}

trunk/core/web/html/assignments/MyAssignments.html

r17797	r17800
73	73	</table>
74	74	</div>
75		<div style="position: absolute; left: 10px; top:7px; width: 135px; height: 30px; z-index: 25">
76		<label style=" font-family: Arial,sans-serif; font-weight: bold; font-size: medium; ">Filter
77		</label>
78		</div>
79		<t:Footer/>
	75	<div style="visibility: hidden;"><t:Footer/></div>
80	76	<script type="text/javascript">
81	77	document.getElementById('tLeftframe').style.zIndex = "1";

trunk/core/web/src/components/myAssignmentFilter-form.js

r17797	r17800
1
2		var assignmentNameComparatorComboData = [['equals','Equal To'],['notequals','Not Equal To'],['contains','Contains Ignore Case']];
3		var percentCompleteComparatorComboData = [['equals','Equal To'],['notequals','Not Equal To'],['lessthan','Less Than'],['greaterthan','Greater Than']];
4		var typeComboData = [['','All'],['meeting','Meeting'],['task','Task'],['activity','Activity'],['form_data','Form']];
5		var statusComboData = [['','All'],['', 'All Open Assignments'],['10', 'Assigned'],['20','Accepted'],['30','In Process'],['40','Completed,unconfirmed'],['50','Completed,confirmed'],['60','Delegated'],['70','Rejected'],['80','Returned']];
6
7		var ProjectSpace;
8		var assignmentType;
9		var percentCompleteComparator;
10		var statusFilter;
11		var allAssignments;
12		var lateTask;
13		var taskComingDue;
14		var shouldHaveStart;
15		var inProgress;
16		var assignmentNameComparator;
17		var fromDate;
18		var toDate;
19		var percentComplete;
20		var nameText;
21		var filterForm;
22
23		filterForm = new Ext.FormPanel({
24
25		labelWidth : 75,
26		frame : true,
27		collapsible : true,
28		collapsed : true,
29		labelAlign : 'right',
30		height : 300,
31		width : 730,
32		region :'north',
33		items : [{
34		layout :'column',
35		border :false,
36		items :[{
37		columnWidth : .3,
38		layout : 'form',
39		border : false,
40		items : [
41		assignmentType = new Ext.ux.Multiselect({
42		xtype : 'multiselect',
43		name : 'assignmentType',
44		dataFields : ['code', 'desc'],
45		data : typeComboData,
46		value : 'task',
47		valueField : 'code',
48		displayField : 'desc',
49		width : 200,
50		height : 100,
51		allowBlank : true,
52		hideLabel : true,
53		labelSeparator : '',
54		tbar : [{text:"Assignment Type"}]
55
56		}),
57		{
58		xtype : 'textfield',
59		name : 'nameText',
60		labelSeparator : '',
61		hidden : true,
62		width : 100
63		},
64		{
65		xtype :'textfield',
66		name :'nameText',
67		labelSeparator : '',
68		hidden : true,
69		width :100
70		},
71		{
72		xtype :'textfield',
73		name :'nameText',
74		labelSeparator : '',
75		hidden : true,
76		width :100
77		},
78		ProjectSpace = new Ext.ux.Multiselect({
79		xtype : 'multiselect',
80		name : 'workFilter',
81		dataFields : ['code', 'desc'],
82		data : projectOptionsData,
83		valueField : 'code',
84		displayField : 'desc',
85		width : 200,
86		height : 100,
87		allowBlank : true,
88		hideLabel : true,
89		labelSeparator : '',
90		tbar : [{text:"Workspace Filter"}]
91
92		})
93
94		]
95		},
96		{
97		columnWidth :.4,
98		layout : 'form',
99		border : false,
100		items : [
101		percentCompleteComparator = new Ext.form.ComboBox({
102		fieldLabel : '%Complete',
103		hiddenName :'percentCompleteComparator',
104		store : new Ext.data.SimpleStore({
105		fields : ['taskC', 'taskCrieteria'],
106		data : percentCompleteComparatorComboData
107		}),
108		valueField : 'taskC',
109		displayField : 'taskCrieteria',
110		typeAhead : true,
111		mode : 'local',
112		triggerAction : 'all',
113		emptyText : 'Select...',
114		selectOnFocus : true,
115		labelSeparator : '',
116		value : 'lessthan',
117		width : 100
118		}),
119		percentComplete = new Ext.form.TextField({
120		xtype :'textfield',
121		labelSeparator : '',
122		name : 'percentComplete',
123		width :100,
124		value :100
125		}),
126		statusFilter = new Ext.form.ComboBox({
127		fieldLabel : 'Status Filter',
128		hiddenName :'statusFilter',
129		store : new Ext.data.SimpleStore({
130		fields : ['taskC', 'taskCrieteria'],
131		data : statusComboData
132		}),
133		valueField :'taskC',
134		displayField :'taskCrieteria',
135		typeAhead : true,
136		mode : 'local',
137		triggerAction : 'all',
138		value : '',
139		emptyText :'Select...',
140		selectOnFocus :true,
141		labelSeparator : '',
142		width :100
143
144		}),
145		allAssignments = new Ext.form.Checkbox ({
146		name : 'allAssignments',
147		boxLabel : 'All Assignments',
148		labelSeparator : ''
149		}),
150		lateTask = new Ext.form.Checkbox ({
151		boxLabel : 'Last Assignmnets',
152		name : 'lateTask',
153		labelSeparator : ''
154		}),
155		taskComingDue = new Ext.form.Checkbox ({
156		boxLabel : 'Coming Due',
157		name : 'taskComingDue',
158		labelSeparator : ''
159		}),
160		shouldHaveStart = new Ext.form.Checkbox ({
161		boxLabel : 'Should Have Started',
162		name : 'shouldHaveStart',
163		labelSeparator : ''
164		}),
165		inProgress = new Ext.form.Checkbox ({
166		boxLabel : 'In Progress',
167		name : 'inProgress',
168		labelSeparator : ''
169		}),
170
171		]
172		},
173		{
174		columnWidth :.3,
175		layout : 'form',
176		border : false,
177		items : [
178		assignmentNameComparator = new Ext.form.ComboBox({
179		fieldLabel : 'Name',
180		hiddenName :'name',
181		store : new Ext.data.SimpleStore({
182		fields : ['criteria', 'criteriaWord'],
183		data : assignmentNameComparatorComboData
184		}),
185		valueField :'criteria',
186		displayField :'criteriaWord',
187		typeAhead : true,
188		mode : 'local',
189		triggerAction : 'all',
190		emptyText :'Select...',
191		selectOnFocus :true,
192		labelSeparator : '',
193		width :75
194		}),
195		nameText= new Ext.form.TextField({
196		xtype :'textfield',
197		name :'nameText',
198		labelSeparator : '',
199		width :100
200		}),
201		fromDate = new Ext.form.TextField({
202		fieldLabel : 'Assigned Dates From (m/d/yy):',
203		name : 'fromDate',
204		width : 100,
205		labelSeparator : '',
206		allowBlank : false
207		}),
208		toDate = new Ext.form.TextField({
209		fieldLabel : 'To (m/d/yy):',
210		name : 'toDate',
211		width :100,
212		labelSeparator : '',
213		allowBlank :false
214