From d66b6346e534ad2c982cc8495f018152b4380b5b Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 13 May 2020 13:29:32 +0200 Subject: [PATCH] use documentListRow() --- views/bootstrap/class.MyDocuments.php | 152 +++++++++++++++----------- 1 file changed, 89 insertions(+), 63 deletions(-) diff --git a/views/bootstrap/class.MyDocuments.php b/views/bootstrap/class.MyDocuments.php index c05ec4bc2..b572359a0 100644 --- a/views/bootstrap/class.MyDocuments.php +++ b/views/bootstrap/class.MyDocuments.php @@ -36,6 +36,17 @@ require_once("SeedDMS/Preview.php"); */ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style { + function js() { /* {{{ */ + $dms = $this->params['dms']; + $user = $this->params['user']; + + header('Content-Type: application/javascript'); + parent::jsTranslations(array('cancel', 'splash_move_document', 'confirm_move_document', 'move_document', 'confirm_transfer_link_document', 'transfer_content', 'link_document', 'splash_move_folder', 'confirm_move_folder', 'move_folder')); + $this->printDeleteDocumentButtonJs(); + /* Add js for catching click on document in one page mode */ + $this->printClickDocumentJs(); + } /* }}} */ + function show() { /* {{{ */ $dms = $this->params['dms']; $user = $this->params['user']; @@ -47,6 +58,8 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style { $timeout = $this->params['timeout']; $xsendfile = $this->params['xsendfile']; + $this->htmlAddHeader(''."\n", 'js'); + $db = $dms->getDB(); $previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout, $xsendfile); @@ -147,7 +160,7 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style { // List the documents where a review has been requested. if($workflowmode == 'traditional') { $this->contentHeading(getMLText("documents_to_review")); - $this->contentContainerStart(); + //$this->contentContainerStart(); $printheader=true; $dList = array(); foreach ($reviewStatus["indstatus"] as $st) { @@ -162,14 +175,14 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style { print "\n\n"; print "\n"; print "".getMLText("name")."\n"; - print "".getMLText("owner")."\n"; - print "".getMLText("version")."\n"; - print "".getMLText("last_update")."\n"; - print "".getMLText("expires")."\n"; + print "".getMLText("status")."\n"; + print "".getMLText("action")."\n"; print "\n\n\n"; $printheader=false; } - + + echo $this->documentListRow($document, $previewer); + /* print "\n"; $latestContent = $document->getLatestContent(); $previewer->createPreview($latestContent); @@ -186,6 +199,7 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style { print "".$st["date"]." ". htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["statusName"]) .""; print "".(!$docIdx[$st["documentID"]][$st["version"]]["expires"] ? "-":getReadableDate($docIdx[$st["documentID"]][$st["version"]]["expires"])).""; print "\n"; + */ } } foreach ($reviewStatus["grpstatus"] as $st) { @@ -200,14 +214,14 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style { print "\n\n"; print "\n"; print "".getMLText("name")."\n"; - print "".getMLText("owner")."\n"; - print "".getMLText("version")."\n"; - print "".getMLText("last_update")."\n"; - print "".getMLText("expires")."\n"; + print "".getMLText("status")."\n"; + print "".getMLText("action")."\n"; print "\n\n\n"; $printheader=false; } + echo $this->documentListRow($document, $previewer); + /* print "\n"; $latestContent = $document->getLatestContent(); $previewer->createPreview($latestContent); @@ -224,6 +238,7 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style { print "".$st["date"]." ". htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["statusName"]).""; print "".(!$docIdx[$st["documentID"]][$st["version"]]["expires"] ? "-":getReadableDate($docIdx[$st["documentID"]][$st["version"]]["expires"])).""; print "\n"; + */ } } if (!$printheader){ @@ -231,12 +246,12 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style { }else{ printMLText("no_docs_to_review"); } - $this->contentContainerEnd(); +// $this->contentContainerEnd(); } // List the documents where an approval has been requested. $this->contentHeading(getMLText("documents_to_approve")); - $this->contentContainerStart(); +// $this->contentContainerStart(); $printheader=true; foreach ($approvalStatus["indstatus"] as $st) { @@ -250,14 +265,14 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style { print "\n\n"; print "\n"; print "".getMLText("name")."\n"; - print "".getMLText("owner")."\n"; - print "".getMLText("version")."\n"; - print "".getMLText("last_update")."\n"; - print "".getMLText("expires")."\n"; + print "".getMLText("status")."\n"; + print "".getMLText("action")."\n"; print "\n\n\n"; $printheader=false; } + echo $this->documentListRow($document, $previewer); + /* print "\n"; $latestContent = $document->getLatestContent(); $previewer->createPreview($latestContent); @@ -274,6 +289,7 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style { print "".$st["date"]." ". htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["statusName"]).""; print "".(!$docIdx[$st["documentID"]][$st["version"]]["expires"] ? "-":getReadableDate($docIdx[$st["documentID"]][$st["version"]]["expires"])).""; print "\n"; + */ } } foreach ($approvalStatus["grpstatus"] as $st) { @@ -286,13 +302,14 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style { print "\n\n"; print "\n"; print "".getMLText("name")."\n"; - print "".getMLText("owner")."\n"; - print "".getMLText("version")."\n"; - print "".getMLText("last_update")."\n"; - print "".getMLText("expires")."\n"; + print "".getMLText("status")."\n"; + print "".getMLText("action")."\n"; print "\n\n\n"; $printheader=false; } + + echo $this->documentListRow($document, $previewer); + /* print "\n"; $latestContent = $document->getLatestContent(); $previewer->createPreview($latestContent); @@ -309,6 +326,7 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style { print "".$st["date"]." ". htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["statusName"]).""; print "".(!$docIdx[$st["documentID"]][$st["version"]]["expires"] ? "-":getReadableDate($docIdx[$st["documentID"]][$st["version"]]["expires"])).""; print "\n"; + */ } } if (!$printheader){ @@ -316,7 +334,7 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style { }else{ printMLText("no_docs_to_approve"); } - $this->contentContainerEnd(); + //$this->contentContainerEnd(); } else { if($workflowmode == 'traditional') { @@ -361,7 +379,7 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style { } $this->contentHeading(getMLText("documents_user_requiring_attention")); - $this->contentContainerStart(); + //$this->contentContainerStart(); if (count($resArr)>0) { print ""; @@ -369,9 +387,7 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style { print ""; print "\n"; print "\n"; - print "\n"; - print "\n"; - print "\n"; + print "\n"; print "\n\n\n"; foreach ($resArr as $res) { @@ -385,6 +401,8 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style { } } + echo $this->documentListRow($document, $previewer); + /* print "\n"; $latestContent = $document->getLatestContent(); $previewer->createPreview($latestContent); @@ -401,13 +419,14 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style { print ""; print ""; print "\n"; + */ } print "
".getMLText("name")."".getMLText("status")."".getMLText("version")."".getMLText("last_update")."".getMLText("expires")."".getMLText("action")."
".$res["statusDate"]." ".htmlspecialchars($res["statusName"])."".(!$res["expires"] ? "-":getReadableDate($res["expires"]))."
"; } else printMLText("no_docs_to_look_at"); - $this->contentContainerEnd(); + //$this->contentContainerEnd(); // Get list of documents owned by current user that are pending review or // pending approval. @@ -439,7 +458,7 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style { } $this->contentHeading(getMLText("documents_user_rejected")); - $this->contentContainerStart(); + //$this->contentContainerStart(); if (count($resArr)>0) { print ""; @@ -447,9 +466,7 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style { print ""; print "\n"; print "\n"; - print "\n"; - print "\n"; - print "\n"; + print "\n"; print "\n\n\n"; foreach ($resArr as $res) { @@ -463,6 +480,8 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style { } } + echo $this->documentListRow($document, $previewer); + /* print "\n"; $latestContent = $document->getLatestContent(); $previewer->createPreview($latestContent); @@ -479,13 +498,14 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style { print ""; print ""; print "\n"; + */ } print "
".getMLText("name")."".getMLText("status")."".getMLText("version")."".getMLText("last_update")."".getMLText("expires")."".getMLText("action")."
".$res["statusDate"]." ".htmlspecialchars($res["statusName"])."".(!$res["expires"] ? "-":getReadableDate($res["expires"]))."
"; } else printMLText("no_docs_to_look_at"); - $this->contentContainerEnd(); + //$this->contentContainerEnd(); } elseif($workflowmode == 'advanced') { // Get document list for the current user. $workflowStatus = $user->getWorkflowStatus(); @@ -556,7 +576,7 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style { // List the documents where a review has been requested. $this->contentHeading(getMLText("documents_to_process")); - $this->contentContainerStart(); + //$this->contentContainerStart(); $printheader=true; $iRev = array(); $dList = array(); @@ -572,15 +592,14 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style { print "\n\n"; print "\n"; print "".getMLText("name")."\n"; - print "".getMLText("owner")."\n"; print "".getMLText("status")."\n"; - print "".getMLText("version")."\n"; - print "".getMLText("last_update")."\n"; - print "".getMLText("expires")."\n"; + print "".getMLText("action")."\n"; print "\n\n\n"; $printheader=false; } + echo $this->documentListRow($document, $previewer); + /* print "\n"; $latestContent = $document->getLatestContent(); $workflow = $latestContent->getWorkflow(); @@ -600,6 +619,7 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style { print "".$st["date"]." ". htmlspecialchars($docIdx[$st["document"]][$st["version"]]["statusName"]) .""; print "".(!$docIdx[$st["document"]][$st["version"]]["expires"] ? "-":getReadableDate($docIdx[$st["document"]][$st["version"]]["expires"])).""; print "\n"; + */ } } foreach ($workflowStatus["g"] as $st) { @@ -614,15 +634,14 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style { print "\n\n"; print "\n"; print "".getMLText("name")."\n"; - print "".getMLText("owner")."\n"; print "".getMLText("status")."\n"; - print "".getMLText("version")."\n"; - print "".getMLText("last_update")."\n"; - print "".getMLText("expires")."\n"; + print "".getMLText("action")."\n"; print "\n\n\n"; $printheader=false; } + echo $this->documentListRow($document, $previewer); + /* print "\n"; $latestContent = $document->getLatestContent(); $workflow = $latestContent->getWorkflow(); @@ -642,6 +661,7 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style { print "".$st["date"]." ". htmlspecialchars($docIdx[$st["document"]][$st["version"]]["statusName"]).""; print "".(!$docIdx[$st["document"]][$st["version"]]["expires"] ? "-":getReadableDate($docIdx[$st["document"]][$st["version"]]["expires"])).""; print "\n"; + */ } } if (!$printheader){ @@ -649,7 +669,7 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style { }else{ printMLText("no_docs_to_check"); } - $this->contentContainerEnd(); + //$this->contentContainerEnd(); } // Get list of documents owned by current user that are pending review or @@ -682,7 +702,7 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style { } $this->contentHeading(getMLText("documents_user_requiring_attention")); - $this->contentContainerStart(); + //$this->contentContainerStart(); if (count($resArr)>0) { print ""; @@ -690,9 +710,7 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style { print ""; print "\n"; print "\n"; - print "\n"; - print "\n"; - print "\n"; + print "\n"; print "\n\n\n"; foreach ($resArr as $res) { @@ -706,6 +724,8 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style { } } + echo $this->documentListRow($document, $previewer); + /* print "\n"; $latestContent = $document->getLatestContent(); $workflow = $latestContent->getWorkflow(); @@ -725,13 +745,14 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style { print ""; print ""; print "\n"; + */ } print "
".getMLText("name")."".getMLText("status")."".getMLText("version")."".getMLText("last_update")."".getMLText("expires")."".getMLText("action")."
".$res["statusDate"]." ".htmlspecialchars($res["statusName"])."".(!$res["expires"] ? "-":getReadableDate($res["expires"]))."
"; } else printMLText("no_docs_to_look_at"); - $this->contentContainerEnd(); + //$this->contentContainerEnd(); } // Get list of documents locked by current user @@ -762,7 +783,7 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style { } $this->contentHeading(getMLText("documents_locked_by_you")); - $this->contentContainerStart(); + //$this->contentContainerStart(); if (count($resArr)>0) { print ""; @@ -770,9 +791,7 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style { print ""; print "\n"; print "\n"; - print "\n"; - print "\n"; - print "\n"; + print "\n"; print "\n\n\n"; foreach ($resArr as $res) { @@ -786,6 +805,8 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style { } } + echo $this->documentListRow($document, $previewer); + /* print "\n"; $latestContent = $document->getLatestContent(); if($workflowmode == 'advanced') @@ -809,18 +830,19 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style { print ""; print ""; print "\n"; + */ } print "
".getMLText("name")."".getMLText("status")."".getMLText("version")."".getMLText("last_update")."".getMLText("expires")."".getMLText("action")."
".$res["statusDate"]." ".htmlspecialchars($res["statusName"])."".(!$res["expires"] ? "-":getReadableDate($res["expires"]))."
"; } else printMLText("no_docs_locked"); - $this->contentContainerEnd(); + //$this->contentContainerEnd(); /* Documents expired */ if($docs = $dms->getDocumentsExpired(-3*365, $user)) { $this->contentHeading(getMLText("documents_expired")); - $this->contentContainerStart(); + //$this->contentContainerStart(); if (count($docs)>0) { print ""; @@ -828,13 +850,13 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style { print ""; print "\n"; print "\n"; - print "\n"; - print "\n"; - print "\n"; + print "\n"; print "\n\n\n"; foreach ($docs as $document) { + echo $this->documentListRow($document, $previewer); + /* print "\n"; $latestContent = $document->getLatestContent(); if($workflowmode == 'advanced') @@ -859,13 +881,14 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style { print ""; print ""; print "\n"; - } + */ + } print "
".getMLText("name")."".getMLText("status")."".getMLText("version")."".getMLText("last_update")."".getMLText("expires")."".getMLText("action")."
".$status["date"]." ".htmlspecialchars($dms->getUser($status["userID"])->getFullName())."".(!$document->getExpires() ? "-":getReadableDate($document->getExpires()))."
"; } else printMLText("no_docs_expired"); - $this->contentContainerEnd(); + //$this->contentContainerEnd(); } } @@ -916,18 +939,18 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style { } $this->contentHeading(getMLText("all_documents")); - $this->contentContainerStart(); + //$this->contentContainerStart(); if (count($resArr)>0) { print ""; print "\n\n"; print ""; - print "\n"; + print "\n"; print "\n"; - print "\n"; - print "\n"; - print "\n"; + print "\n"; print "\n\n\n"; $previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout, $xsendfile); @@ -942,6 +965,8 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style { } } + echo $this->documentListRow($document, $previewer); + /* print "\n"; $latestContent = $document->getLatestContent(); $previewer->createPreview($latestContent); @@ -959,12 +984,13 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style { //print ""; print ""; print "\n"; + */ } print "
".getMLText("name")."".getMLText("name")." — \n"; + print "".getMLText("last_update")." — \n"; + print "".getMLText("expires")."".getMLText("status")."".getMLText("version")."".getMLText("last_update")."".getMLText("expires")."".getMLText("action")."
".(!$res["expires"] ? getMLText("does_not_expire"):getReadableDate($res["expires"]))."".(!$res["expires"] ? "-":getReadableDate($res["expires"]))."
"; } else printMLText("empty_notify_list"); - $this->contentContainerEnd(); + //$this->contentContainerEnd(); } $this->contentEnd();