mirror of
				https://git.code.sf.net/p/seeddms/code
				synced 2025-10-30 20:51:22 +00:00 
			
		
		
		
	show counter for tasks only for selected tasks in configuration
This commit is contained in:
		
							parent
							
								
									db66dff191
								
							
						
					
					
						commit
						90bf0f13f4
					
				|  | @ -39,10 +39,9 @@ class SeedDMS_View_Tasks extends SeedDMS_Bootstrap_Style { | |||
| 	private function __myTasks() { /* {{{ */ | ||||
| 		$dms = $this->params['dms']; | ||||
| 		$user = $this->params['user']; | ||||
| 		$tasks['review'] = array(); | ||||
| 		$tasksinmenu = $this->params['tasksinmenu']; | ||||
| 		if(!$tasksinmenu || in_array('approval', $tasksinmenu)) { | ||||
| 			$tasks['approval'] = array(); | ||||
| 		$tasks['receipt'] = array(); | ||||
| 		$tasks['revision'] = array(); | ||||
| 			$resArr = $dms->getDocumentList('ApproveByMe', $user); | ||||
| 			if($resArr) { | ||||
| 				foreach ($resArr as $res) { | ||||
|  | @ -52,6 +51,9 @@ class SeedDMS_View_Tasks extends SeedDMS_Bootstrap_Style { | |||
| 					} | ||||
| 				} | ||||
| 			} | ||||
| 		} | ||||
| 		if(!$tasksinmenu || in_array('review', $tasksinmenu)) { | ||||
| 			$tasks['review'] = array(); | ||||
| 			$resArr = $dms->getDocumentList('ReviewByMe', $user); | ||||
| 			if($resArr) { | ||||
| 				foreach ($resArr as $res) { | ||||
|  | @ -61,6 +63,9 @@ class SeedDMS_View_Tasks extends SeedDMS_Bootstrap_Style { | |||
| 					} | ||||
| 				} | ||||
| 			} | ||||
| 		} | ||||
| 		if(!$tasksinmenu || in_array('receipt', $tasksinmenu)) { | ||||
| 			$tasks['receipt'] = array(); | ||||
| 			$resArr = $dms->getDocumentList('ReceiptByMe', $user); | ||||
| 			if($resArr) { | ||||
| 				foreach ($resArr as $res) { | ||||
|  | @ -70,6 +75,9 @@ class SeedDMS_View_Tasks extends SeedDMS_Bootstrap_Style { | |||
| 					} | ||||
| 				} | ||||
| 			} | ||||
| 		} | ||||
| 		if(!$tasksinmenu || in_array('revision', $tasksinmenu)) { | ||||
| 			$tasks['revision'] = array(); | ||||
| 			$resArr = $dms->getDocumentList('ReviseByMe', $user); | ||||
| 			if($resArr) { | ||||
| 				foreach ($resArr as $res) { | ||||
|  | @ -79,6 +87,7 @@ class SeedDMS_View_Tasks extends SeedDMS_Bootstrap_Style { | |||
| 					} | ||||
| 				} | ||||
| 			} | ||||
| 		} | ||||
| 		return $tasks; | ||||
| 	} /* }}} */ | ||||
| 
 | ||||
|  | @ -135,13 +144,28 @@ class SeedDMS_View_Tasks extends SeedDMS_Bootstrap_Style { | |||
| 		$user = $this->params['user']; | ||||
| 
 | ||||
| 		$tasks = $this->__myTasks(); | ||||
| 		if(!$tasks) | ||||
| 			return ''; | ||||
| 
 | ||||
| 		$content = ''; | ||||
| //		$content .= "   <ul id=\"main-menu-tasks\" class=\"nav pull-right\">\n";
 | ||||
| //		$content .= "    <li class=\"dropdown\">\n";
 | ||||
| 		$content .= "     <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\">".getMLText('tasks')." (".count($tasks['review'])."/".count($tasks['approval'])."/".count($tasks['receipt'])."/".count($tasks['revision']).") <i class=\"icon-caret-down\"></i></a>\n"; | ||||
| 		$content .= "     <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\">".getMLText('tasks')." ("; | ||||
| 		$ct = array(); | ||||
| 		if(isset($tasks['review'])) | ||||
| 			$ct[] = count($tasks['review']); | ||||
| 		if(isset($tasks['approval'])) | ||||
| 			$ct[] = count($tasks['approval']); | ||||
| 		if(isset($tasks['receipt'])) | ||||
| 			$ct[] = count($tasks['receipt']); | ||||
| 		if(isset($tasks['revision'])) | ||||
| 			$ct[] = count($tasks['revision']); | ||||
| 		$content .= implode('/', $ct); | ||||
| 		$content .= ")"; | ||||
| 		if(!empty($tasks['review']) || !empty($tasks['approval']) || !empty($tasks['receipt']) || !empty($tasks['revision'])) { | ||||
| 		$content .= " <i class=\"icon-caret-down\"></i></a>\n"; | ||||
| 		$content .= "     <ul class=\"dropdown-menu\" role=\"menu\">\n"; | ||||
| 		if($tasks['review']) { | ||||
| 		if(!empty($tasks['review'])) { | ||||
| 		$content .= "      <li class=\"dropdown-submenu\">\n"; | ||||
| 		$content .=	"       <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\">".getMLText("documents_to_review")."</a>\n"; | ||||
| 		$content .= "       <ul class=\"dropdown-menu\" role=\"menu\">\n"; | ||||
|  | @ -152,7 +176,7 @@ class SeedDMS_View_Tasks extends SeedDMS_Bootstrap_Style { | |||
| 		$content .= "       </ul>\n"; | ||||
| 		$content .= "      </li>\n"; | ||||
| 		} | ||||
| 		if($tasks['approval']) { | ||||
| 		if(!empty($tasks['approval'])) { | ||||
| 		$content .= "      <li class=\"dropdown-submenu\">\n"; | ||||
| 		$content .=	"       <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\">".getMLText("documents_to_approve")."</a>\n"; | ||||
| 		$content .= "         <ul class=\"dropdown-menu\" role=\"menu\">\n"; | ||||
|  | @ -163,7 +187,7 @@ class SeedDMS_View_Tasks extends SeedDMS_Bootstrap_Style { | |||
| 		$content .= "       </ul>\n"; | ||||
| 		$content .= "      </li>\n"; | ||||
| 		} | ||||
| 		if($tasks['receipt']) { | ||||
| 		if(!empty($tasks['receipt'])) { | ||||
| 		$content .= "      <li class=\"dropdown-submenu\">\n"; | ||||
| 		$content .=	"       <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\">".getMLText("documents_to_receipt")."</a>\n"; | ||||
| 		$content .= "         <ul class=\"dropdown-menu\" role=\"menu\">\n"; | ||||
|  | @ -174,7 +198,7 @@ class SeedDMS_View_Tasks extends SeedDMS_Bootstrap_Style { | |||
| 		$content .= "       </ul>\n"; | ||||
| 		$content .= "      </li>\n"; | ||||
| 		} | ||||
| 		if($tasks['revision']) { | ||||
| 		if(!empty($tasks['revision'])) { | ||||
| 		$content .= "      <li class=\"dropdown-submenu\">\n"; | ||||
| 		$content .=	"       <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\">".getMLText("documents_to_revise")."</a>\n"; | ||||
| 		$content .= "         <ul class=\"dropdown-menu\" role=\"menu\">\n"; | ||||
|  | @ -190,6 +214,7 @@ class SeedDMS_View_Tasks extends SeedDMS_Bootstrap_Style { | |||
| 			$content .= "    <li><a href=\"../out/out.MyDocuments.php\">".getMLText("my_documents")."</a></li>\n"; | ||||
| 		} | ||||
| 		$content .= "     </ul>\n"; | ||||
| 		} | ||||
| //		$content .= "    </li>\n";
 | ||||
| //		$content .= "   </ul>\n";
 | ||||
| 		echo $content; | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue
	
	Block a user
	 Uwe Steinmann
						Uwe Steinmann