Subversion Repositories SmartDukaan

Rev

Rev 31762 | Rev 35569 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 31762 Rev 33864
Line 225... Line 225...
225
	    					<th>Partner</th>
225
	    					<th>Partner</th>
226
	    					#end
226
	    					#end
227
	    					<th>Category</th>
227
	    					<th>Category</th>
228
	    					<th>SubCategory</th>
228
	    					<th>SubCategory</th>
229
	    				    <th>Message</th>
229
	    				    <th>Message</th>
-
 
230
							<th>Created By</th>
230
	    					<th>Created TimeStamp</th>
231
	    					<th>Created TimeStamp</th>
231
	    					#if($roleType)
232
	    					#if($roleType)
232
	    					<th>Action</th>
233
	    					<th>Action</th>
233
	    					#else
234
	    					#else
234
	    					<th>Action</th>
235
	    					<th>Action</th>
Line 244... Line 245...
244
	 							<td>$fofoIdsAndCustomRetailer.get($ticket.getFofoId()).getBusinessName()</td>
245
	 							<td>$fofoIdsAndCustomRetailer.get($ticket.getFofoId()).getBusinessName()</td>
245
	    						#end
246
	    						#end
246
	    					    <td>$subCategoryIdAndCategoryMap.get($ticket.getSubCategoryId()).getName()</td>
247
	    					    <td>$subCategoryIdAndCategoryMap.get($ticket.getSubCategoryId()).getName()</td>
247
	    			
248
	    			
248
			    				<td><a href="#" data-toggle="modal" data-target="#myModal" data-ticketid="$ticket.getId()" data-internal="true" data-role="$roleType" id="activities" data-assignee="$authUserIdAndAuthUserMap.get($ticket.getId()).getFirstName()">$subCategoryIdAndSubCategoryMap.get($ticket.getSubCategoryId()).getName()</a></td>
249
			    				<td><a href="#" data-toggle="modal" data-target="#myModal" data-ticketid="$ticket.getId()" data-internal="true" data-role="$roleType" id="activities" data-assignee="$authUserIdAndAuthUserMap.get($ticket.getId()).getFirstName()">$subCategoryIdAndSubCategoryMap.get($ticket.getSubCategoryId()).getName()</a></td>
249
			    				<td>$activityMap.get($ticket.getId()).get(0).getMessage()</td>	
250
									<td>$activityMap.get($ticket.getId()).get(0).getMessage()</td>
-
 
251
									#if($activityMapWithActivityId.get($ticket.getFirstActivityId()).get(0).getCreatedBy() > 0)
-
 
252
										<td>$authUserMap.get($activityMapWithActivityId.get($ticket.getFirstActivityId()).get(0).getCreatedBy()).getFirstName() $authUserMap.get($activityMapWithActivityId.get($ticket.getFirstActivityId()).get(0).getCreatedBy()).getLastName()</td>
-
 
253
									#else
-
 
254
										<td>Partner</td>
-
 
255
									#end
250
			    					
256
			    					
251
			    					<td>$ticket.getFormattedCreateTimestamp()</td>
257
			    					<td>$ticket.getFormattedCreateTimestamp()</td>
252
			    					#if($roleType)
258
			    					#if($roleType)
253
			    						#if($ticket.getCloseTimestamp())
259
			    						#if($ticket.getCloseTimestamp())
254
			    							<td>$ticket.getFormattedCloseTimestamp()</td>
260
			    							<td>$ticket.getFormattedCloseTimestamp()</td>