mirror of
				https://git.code.sf.net/p/seeddms/code
				synced 2025-10-30 20:51:22 +00:00 
			
		
		
		
	put list of all documents onto page with all other doc lists
This commit is contained in:
		
							parent
							
								
									8165ee4776
								
							
						
					
					
						commit
						a87ae68c24
					
				|  | @ -46,9 +46,15 @@ $orderby='n'; | |||
| if (isset($_GET["orderby"]) && strlen($_GET["orderby"])==1 ) { | ||||
| 	$orderby=$_GET["orderby"]; | ||||
| } | ||||
| $orderby='asc'; | ||||
| if (!empty($_GET["orderdir"])) { | ||||
| 	$orderdir=$_GET["orderdir"]; | ||||
| } | ||||
| 
 | ||||
| if($view) { | ||||
| 	$view->setParam('orderby', $orderby); | ||||
| 	$view->setParam('orderdir', $orderdir); | ||||
| 	$view->setParam('showtree', showtree()); | ||||
| 	$view->setParam('showinprocess', $showInProcess); | ||||
| 	$view->setParam('workflowmode', $settings->_workflowMode); | ||||
| 	$view->setParam('cachedir', $settings->_cacheDir); | ||||
|  |  | |||
|  | @ -43,7 +43,12 @@ $(document).ready( function() { | |||
| 	$('body').on('click', 'ul.bs-docs-sidenav li a', function(ev){ | ||||
| 		ev.preventDefault(); | ||||
| 		$('#kkkk.ajax').data('action', $(this).data('action')); | ||||
| 		$('#kkkk.ajax').trigger('update', {userid: $(this).val()}); | ||||
| 		$('#kkkk.ajax').trigger('update', {orderby: $(this).data('orderby')}); | ||||
| 	}); | ||||
| 	$('body').on('click', 'table th a', function(ev){ | ||||
| 		ev.preventDefault(); | ||||
| 		$('#kkkk.ajax').data('action', $(this).data('action')); | ||||
| 		$('#kkkk.ajax').trigger('update', {orderby: $(this).data('orderby'), orderdir: $(this).data('orderdir')}); | ||||
| 	}); | ||||
| }); | ||||
| <?php | ||||
|  | @ -463,7 +468,9 @@ $(document).ready( function() { | |||
| 		$dms = $this->params['dms']; | ||||
| 		$user = $this->params['user']; | ||||
| 		$orderby = $this->params['orderby']; | ||||
| 		$orderdir = $this->params['orderdir']; | ||||
| 		$cachedir = $this->params['cachedir']; | ||||
| 		$showtree = $this->params['showtree']; | ||||
| 		$previewwidth = $this->params['previewWidthList']; | ||||
| 		$previewconverters = $this->params['previewconverters']; | ||||
| 		$timeout = $this->params['timeout']; | ||||
|  | @ -472,7 +479,7 @@ $(document).ready( function() { | |||
| 		$previewer->setConverters($previewconverters); | ||||
| 
 | ||||
| 		/* Get list of documents owned by current user */ | ||||
| 		$resArr = $dms->getDocumentList('MyDocs', $user, $orderby); | ||||
| 		$resArr = $dms->getDocumentList('MyDocs', $user, $orderby, $orderdir == 'desc' ? 'desc' : ''); | ||||
| 		if (is_bool($resArr) && !$resArr) { | ||||
| 			$this->contentHeading(getMLText("warning")); | ||||
| 			$this->contentContainer(getMLText("internal_error_exit")); | ||||
|  | @ -488,17 +495,23 @@ $(document).ready( function() { | |||
| 			print "<table class=\"table table-condensed\">"; | ||||
| 			print "<thead>\n<tr>\n"; | ||||
| 			print "<th></th>"; | ||||
| 			print "<th><a href=\"../out/out.MyDocuments.php?orderby=n\">".getMLText("name")."</a></th>\n"; | ||||
| 			print "<th><a href=\"../out/out.MyDocuments.php?orderby=s\">".getMLText("status")."</a></th>\n"; | ||||
| 			print "<th>".getMLText("version")."</th>\n"; | ||||
| 			print "<th><a href=\"../out/out.MyDocuments.php?orderby=u\">".getMLText("last_update")."</a></th>\n"; | ||||
| 			print "<th><a href=\"../out/out.MyDocuments.php?orderby=e\">".getMLText("expires")."</a></th>\n"; | ||||
| 			print "<th><a data-action=\"listMyDocs\" data-orderby=\"n\" data-orderdir=\"".($orderdir == 'desc' ? '' : 'desc')."\">".getMLText("name")."</a> / <a data-action=\"listMyDocs\" data-orderby=\"u\" data-orderdir=\"".($orderdir == 'desc' ? '' : 'desc')."\">".getMLText("last_update")."</a> / <a data-action=\"listMyDocs\" data-orderby=\"e\" data-orderdir=\"".($orderdir == 'desc' ? '' : 'desc')."\">".getMLText("expires")."</a></th>\n"; | ||||
| 			print "<th><a data-action=\"listMyDocs\" data-orderby=\"s\">".getMLText("status")."</a></th>\n"; | ||||
| 			print "<th>".getMLText("action")."</th>\n"; | ||||
| 			print "</tr>\n</thead>\n<tbody>\n"; | ||||
| 
 | ||||
| 			foreach ($resArr as $res) { | ||||
| 				$document = $dms->getDocument($res["documentID"]); | ||||
| 				$document->verifyLastestContentExpriry(); | ||||
| 			 | ||||
| 
 | ||||
| 				$txt = $this->callHook('documentListItem', $document, $previewer); | ||||
| 				if(is_string($txt)) | ||||
| 					echo $txt; | ||||
| 				else { | ||||
| 					echo $this->documentListRow($document, $previewer, false, $res['version']); | ||||
| 				} | ||||
| 
 | ||||
| if(0) { | ||||
| 				// verify expiry
 | ||||
| 				if ( $res["expires"] && time()>$res["expires"]+24*60*60 ){ | ||||
| 					if  ( $res["status"]==S_DRAFT_APP || $res["status"]==S_DRAFT_REV ){ | ||||
|  | @ -524,6 +537,7 @@ $(document).ready( function() { | |||
| 					print "<td>".(!$res["expires"] ? "-":getReadableDate($res["expires"]))."</td>";				 | ||||
| 					print "</tr>\n"; | ||||
| 				} | ||||
| } | ||||
| 			} | ||||
| 			print "</tbody></table>"; | ||||
| 		} | ||||
|  | @ -1147,6 +1161,7 @@ $(document).ready( function() { | |||
| 		$dms = $this->params['dms']; | ||||
| 		$user = $this->params['user']; | ||||
| 		$orderby = $this->params['orderby']; | ||||
| 		$orderdir = $this->params['orderdir']; | ||||
| 		$showInProcess = $this->params['showinprocess']; | ||||
| 		$cachedir = $this->params['cachedir']; | ||||
| 		$workflowmode = $this->params['workflowmode']; | ||||
|  | @ -1167,29 +1182,31 @@ $(document).ready( function() { | |||
| 			echo '<div class="row-fluid">'; | ||||
| 			echo '<div class="span3">'; | ||||
| 			echo '<ul class="nav nav-list bs-docs-sidenav _affix">'; | ||||
| 			$resArr = $dms->getDocumentList('MyDocs', $user); | ||||
| 			echo '<li class=""><a data-href="#all_documents" data-action="listMyDocs"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("all_documents").'</a></li>'; | ||||
| 			if($workflowmode == 'traditional') { | ||||
| 				$resArr = $dms->getDocumentList('AppRevByMe', $user); | ||||
| 				echo '<li class=""><a data-href="#documents_to_review" data-action="listReviews"><span class="badge badge-right">'.count($resArr).'</span>'.getMLText("documents_to_review").'</a></li>'; | ||||
| 				echo '<li class=""><a data-href="#documents_to_review" data-action="listReviews"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_to_review").'</a></li>'; | ||||
| 			} | ||||
| 			if($workflowmode == 'traditional' || $workflowmode == 'traditional_only_approval') { | ||||
| 				$resArr = $dms->getDocumentList('AppRevByMe', $user); | ||||
| 				echo '<li class=""><a data-href="#documents_to_approve" data-action="listApprovals"><span class="badge badge-right">'.count($resArr).'</span>'.getMLText("documents_to_approve").'</a></li>'; | ||||
| 				echo '<li class=""><a data-href="#documents_to_approve" data-action="listApprovals"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_to_approve").'</a></li>'; | ||||
| 			} else { | ||||
| 				$resArr = $dms->getDocumentList('WorkflowByMe', $user); | ||||
| 				echo '<li class=""><a data-href="#documents_to_process" data-action="listWorkflow"><span class="badge badge-right">'.count($resArr).'</span>'.getMLText("documents_to_process").'</a></li>'; | ||||
| 				echo '<li class=""><a data-href="#documents_to_process" data-action="listWorkflow"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_to_process").'</a></li>'; | ||||
| 			} | ||||
| 			$resArr = $dms->getDocumentList('AppRevOwner', $user); | ||||
| 			echo '<li class=""><a data-href="#documents_user_requiring_attention" data-action="listDocsToLookAt"><span class="badge badge-right">'.count($resArr).'</span>'.getMLText("documents_user_requiring_attention").'</a></li>'; | ||||
| 			echo '<li class=""><a data-href="#documents_user_requiring_attention" data-action="listDocsToLookAt"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_user_requiring_attention").'</a></li>'; | ||||
| 			$resArr = $dms->getDocumentList('ReviseByMe', $user); | ||||
| 			echo '<li class=""><a data-href="#documents_to_revise" data-action="listRevisions"><span class="badge badge-right">'.count($resArr).'</span>'.getMLText("documents_to_revise").'</a></li>'; | ||||
| 			echo '<li class=""><a data-href="#documents_to_revise" data-action="listRevisions"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_to_revise").'</a></li>'; | ||||
| 			$resArr = $dms->getDocumentList('ReceiptByMe', $user); | ||||
| 			echo '<li class=""><a data-href="#documents_to_receipt" data-action="listReceipts"><span class="badge badge-right">'.count($resArr).'</span>'.getMLText("documents_to_receipt").'</a></li>'; | ||||
| 			echo '<li class=""><a data-href="#documents_to_receipt" data-action="listReceipts"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_to_receipt").'</a></li>'; | ||||
| 			$resArr = $dms->getDocumentList('RejectOwner', $user); | ||||
| 			echo '<li class=""><a data-href="#documents_user_rejected" data-action="listRejects"><span class="badge badge-right">'.count($resArr).'</span>'.getMLText("documents_user_rejected").'</a></li>'; | ||||
| 			echo '<li class=""><a data-href="#documents_user_rejected" data-action="listRejects"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_user_rejected").'</a></li>'; | ||||
| 			$resArr = $dms->getDocumentList('LockedByMe', $user); | ||||
| 			echo '<li class=""><a data-href="#documents_locked_by_you" data-action="listLockedDocs"><span class="badge badge-right">'.count($resArr).'</span>'.getMLText("documents_locked_by_you").'</a></li>'; | ||||
| 			echo '<li class=""><a data-href="#documents_locked_by_you" data-action="listLockedDocs"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_locked_by_you").'</a></li>'; | ||||
| 			$resArr = $dms->getDocumentList('CheckedOutByMe', $user); | ||||
| 			echo '<li class=""><a data-href="#documents_checked_out_by_you" data-action="listCheckedoutDocs"><span class="badge badge-right">'.count($resArr).'</span>'.getMLText("documents_checked_out_by_you").'</a></li>'; | ||||
| 			echo '<li class=""><a data-href="#documents_checked_out_by_you" data-action="listCheckedoutDocs"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_checked_out_by_you").'</a></li>'; | ||||
|       echo '</ul>'; | ||||
| 			echo '</div>'; | ||||
| 			echo '<div class="span9">'; | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue
	
	Block a user
	 Uwe Steinmann
						Uwe Steinmann