diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php index 37d33eff1..49a98ae20 100644 --- a/views/bootstrap/class.Bootstrap.php +++ b/views/bootstrap/class.Bootstrap.php @@ -3314,6 +3314,35 @@ $('body').on('click', '[id^=\"table-row-folder\"] td:nth-child(2)', function(ev) return $content; } /* }}} */ + function documentListRowReceptionBar($latestContent) { /* {{{ */ + $accessop = $this->params['accessobject']; + + if($accessop->check_view_access($this, array('action'=>'receptionBar')) /*$owner->getID() == $user->getID()*/ && $receiptStatus = $latestContent->getReceiptStatus()) { + $rstat = array('-1'=>0, '0'=>0, '1'=>0, '-2'=>0); + $allcomments = array('-1'=>array(), '1'=>array()); + foreach ($receiptStatus as $r) { + $rstat[''.$r['status']]++; + if($r['comment']) { +// $allcomments[''.$r['status']][] = htmlspecialchars($r['comment']); + $m5 = md5(trim($r['comment'])); + if(isset($allcomments[''.$r['status']][$m5])) + $allcomments[''.$r['status']][$m5]['n']++; + else + $allcomments[''.$r['status']][$m5] = array('n'=>1, 'c'=>htmlspecialchars(trim($r['comment']))); + } + } + $totalreceipts = $rstat['-1'] + $rstat['0'] + $rstat['1']; + if($totalreceipts) { + $content .= " +
+
".($rstat['1'] ? $rstat['1']."/".$totalreceipts : '').($allcomments['1'] ? " ".$this->printPopupBox('', implode('
', formatComment($allcomments['1'])), true) : "")."
+
".($rstat['-1'] ? $rstat['-1']."/".$totalreceipts : '').($allcomments['-1'] ? " ".$this->printPopupBox('', implode('
', formatComment($allcomments['-1'])), true) : "")."
+
"; + } + } + return $content; + } /* }}} */ + function documentListRowAction($document, $previewer, $skipcont=false, $version=0, $extracontent=array()) { /* {{{ */ $user = $this->params['user']; $session = $this->params['session']; @@ -3475,31 +3504,8 @@ $('body').on('click', '[id^=\"table-row-folder\"] td:nth-child(2)', function(ev) $content .= ""; $content .= $this->documentListRowStatus($latestContent); - if($accessop->check_view_access($this, array('action'=>'receptionBar')) /*$owner->getID() == $user->getID()*/ && $receiptStatus = $latestContent->getReceiptStatus()) { - $rstat = array('-1'=>0, '0'=>0, '1'=>0, '-2'=>0); - $allcomments = array('-1'=>array(), '1'=>array()); - foreach ($receiptStatus as $r) { - $rstat[''.$r['status']]++; - if($r['comment']) { -// $allcomments[''.$r['status']][] = htmlspecialchars($r['comment']); - $m5 = md5(trim($r['comment'])); - if(isset($allcomments[''.$r['status']][$m5])) - $allcomments[''.$r['status']][$m5]['n']++; - else - $allcomments[''.$r['status']][$m5] = array('n'=>1, 'c'=>htmlspecialchars(trim($r['comment']))); - } - } - $totalreceipts = $rstat['-1'] + $rstat['0'] + $rstat['1']; - if($totalreceipts) { - $content .= " -
-
".($rstat['1'] ? $rstat['1']."/".$totalreceipts : '').($allcomments['1'] ? " ".$this->printPopupBox('', implode('
', formatComment($allcomments['1'])), true) : "")."
-
".($rstat['-1'] ? $rstat['-1']."/".$totalreceipts : '').($allcomments['-1'] ? " ".$this->printPopupBox('', implode('
', formatComment($allcomments['-1'])), true) : "")."
-
"; - } - } - $content .= ""; -// $content .= "".$version.""; + $content .= $this->documentListRowReceptionBar($latestContent); + $content .= ""; $content .= ""; $content .= $this->documentListRowAction($document, $previewer, $skipcont, $version, $extracontent); $content .= ""; diff --git a/views/bootstrap4/class.Bootstrap4.php b/views/bootstrap4/class.Bootstrap4.php index 4133b0fd0..e2e843af6 100644 --- a/views/bootstrap4/class.Bootstrap4.php +++ b/views/bootstrap4/class.Bootstrap4.php @@ -3288,6 +3288,36 @@ $('body').on('click', '[id^=\"table-row-folder\"] td:nth-child(2)', function(ev) return $content; } /* }}} */ + function documentListRowReceptionBar($latestContent) { /* {{{ */ + $accessop = $this->params['accessobject']; + + $content = ''; + if($accessop->check_view_access($this, array('action'=>'receptionBar')) /*$owner->getID() == $user->getID()*/ && $receiptStatus = $latestContent->getReceiptStatus()) { + $rstat = array('-1'=>0, '0'=>0, '1'=>0, '-2'=>0); + $allcomments = array('-1'=>array(), '1'=>array()); + foreach ($receiptStatus as $r) { + $rstat[''.$r['status']]++; + if($r['comment']) { +// $allcomments[''.$r['status']][] = htmlspecialchars($r['comment']); + $m5 = md5(trim($r['comment'])); + if(isset($allcomments[''.$r['status']][$m5])) + $allcomments[''.$r['status']][$m5]['n']++; + else + $allcomments[''.$r['status']][$m5] = array('n'=>1, 'c'=>htmlspecialchars(trim($r['comment']))); + } + } + $totalreceipts = $rstat['-1'] + $rstat['0'] + $rstat['1']; + if($totalreceipts) { + $content .= " +
+
".($rstat['1'] ? $rstat['1']."/".$totalreceipts : '').($allcomments['1'] ? " ".$this->printPopupBox('', implode('
', formatComment($allcomments['1'])), true) : "")."
+
".($rstat['-1'] ? $rstat['-1']."/".$totalreceipts : '').($allcomments['-1'] ? " ".$this->printPopupBox('', implode('
', formatComment($allcomments['-1'])), true) : "")."
+
"; + } + } + return $content; + } /* }}} */ + function documentListRowAction($document, $previewer, $skipcont=false, $version=0, $extracontent=array()) { /* {{{ */ $user = $this->params['user']; $session = $this->params['session']; @@ -3448,31 +3478,8 @@ $('body').on('click', '[id^=\"table-row-folder\"] td:nth-child(2)', function(ev) $content .= ""; $content .= $this->documentListRowStatus($latestContent); - if($accessop->check_view_access($this, array('action'=>'receptionBar')) /*$owner->getID() == $user->getID()*/ && $receiptStatus = $latestContent->getReceiptStatus()) { - $rstat = array('-1'=>0, '0'=>0, '1'=>0, '-2'=>0); - $allcomments = array('-1'=>array(), '1'=>array()); - foreach ($receiptStatus as $r) { - $rstat[''.$r['status']]++; - if($r['comment']) { -// $allcomments[''.$r['status']][] = htmlspecialchars($r['comment']); - $m5 = md5(trim($r['comment'])); - if(isset($allcomments[''.$r['status']][$m5])) - $allcomments[''.$r['status']][$m5]['n']++; - else - $allcomments[''.$r['status']][$m5] = array('n'=>1, 'c'=>htmlspecialchars(trim($r['comment']))); - } - } - $totalreceipts = $rstat['-1'] + $rstat['0'] + $rstat['1']; - if($totalreceipts) { - $content .= " -
-
".($rstat['1'] ? $rstat['1']."/".$totalreceipts : '').($allcomments['1'] ? " ".$this->printPopupBox('', implode('
', formatComment($allcomments['1'])), true) : "")."
-
".($rstat['-1'] ? $rstat['-1']."/".$totalreceipts : '').($allcomments['-1'] ? " ".$this->printPopupBox('', implode('
', formatComment($allcomments['-1'])), true) : "")."
-
"; - } - } - $content .= ""; -// $content .= "".$version.""; + $content .= $this->documentListRowReceptionBar($latestContent); + $content .= ""; $content .= ""; $content .= $this->documentListRowAction($document, $previewer, $skipcont, $version, $extracontent); $content .= "";