From 2c1fb2826b5fc65d0f8984085f3afc5340006a85 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Fri, 14 Apr 2023 15:31:41 +0800
Subject: [PATCH 1/4] * Code for story #43815.

---
 module/block/control.php                    |  5 ++
 module/block/view/docviewlistblock.html.php | 51 +++++++++++++++++++++
 module/doc/lang/de.php                      |  1 +
 module/doc/lang/en.php                      |  1 +
 module/doc/lang/fr.php                      |  1 +
 module/doc/lang/zh-cn.php                   |  1 +
 6 files changed, 60 insertions(+)

diff --git a/module/block/control.php b/module/block/control.php
index 040259e31f..288a1d2848 100755
--- a/module/block/control.php
+++ b/module/block/control.php
@@ -2119,6 +2119,11 @@ class block extends control
      */
     public function printDocViewListBlock()
     {
+        /* Load pager. */
+        $this->app->loadClass('pager', $static = true);
+        $pager = new pager(0, 6, 1);
+
+        $this->view->docList = $this->loadModel('doc')->getMineList('view', 'all', 'views_desc', $pager);
     }
 
     /**
diff --git a/module/block/view/docviewlistblock.html.php b/module/block/view/docviewlistblock.html.php
index e69de29bb2..ba9f5a9645 100644
--- a/module/block/view/docviewlistblock.html.php
+++ b/module/block/view/docviewlistblock.html.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * The docviewlistblock view file of block module of ZenTaoPMS.
+ *
+ * @copyright   Copyright 2009-2023 禅道软件（青岛）有限公司(ZenTao Software (Qingdao) Co., Ltd. www.cnezsoft.com)
+ * @license     ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html)
+ * @author      Shujie Tian <tianshujie@easycorp.ltd>
+ * @package     block
+ * @version     $Id$
+ * @link        https://www.zentao.net
+ */
+?>
+<style>
+.block-docviewlist .panel-body {padding-top: 0px;}
+.block-docviewlist .doc-list > .doc-title {display: flex; overflow: hidden; text-overflow: clip; white-space: nowrap; padding: 10px 0;}
+.block-docviewlist .doc-list > .doc-title > .label-rank {margin-right: 10px; padding-top: 1px; border: unset;}
+.block-docviewlist .doc-list > .doc-title > .label-rank-1 {color: #FC5959; background-color: #FFE2D9;}
+.block-docviewlist .doc-list > .doc-title > .label-rank-2 {color: #FF8058; background-color: #FFE2D9;}
+.block-docviewlist .doc-list > .doc-title > .label-rank-3 {color: #FF9F46; background-color: #FFECDB;}
+.block-docviewlist .doc-list > .doc-title > a {overflow: hidden; max-width: calc(100% - 30px);}
+.block-docviewlist .doc-list > .doc-title > .label-view-count {margin-left: 10px;}
+.block-docviewlist .doc-list > .doc-title > .label-view-count > .view-text {color: #838A9D;}
+</style>
+<div class="panel-body">
+  <?php if(empty($docList)):?>
+    <div class='table-empty-tip'><p><span class='text-muted'><?php echo $lang->doc->noDoc;?></p></span></div>
+  <?php else:?>
+  <div class="doc-list">
+    <?php $rank = 1;?>
+    <?php foreach($docList as $doc):?>
+    <div class='doc-title'>
+      <span class="label-pri label-rank label-rank-<?php echo $rank;?>"><?php echo $rank;?></span>
+      <?php
+      if(common::hasPriv('doc', 'view'))
+      {
+          echo html::a($this->createLink('doc', 'view', "docID=$doc->id"), $doc->title, '', "title='{$doc->title}' class='doc-title' data-app='{$this->app->tab}'");
+      }
+      else
+      {
+          echo "<span class='doc-title'>$icon {$doc->title}</span>";
+      }
+      ?>
+      <div class='label-view-count'>
+        <span class='view-text'><?php echo sprintf($lang->doc->viewCount, $doc->views);?></span>
+      </div>
+    </div>
+    <?php $rank ++;?>
+    <?php endforeach;?>
+  </div>
+  <?php endif;?>
+</div>
diff --git a/module/doc/lang/de.php b/module/doc/lang/de.php
index e84bd12ab7..02799655cb 100644
--- a/module/doc/lang/de.php
+++ b/module/doc/lang/de.php
@@ -155,6 +155,7 @@ $lang->doc->todayUpdated  = "Today's update";
 $lang->doc->daysUpdated   = 'Updated %s days ago';
 $lang->doc->monthsUpdated = 'Updated %s months ago';
 $lang->doc->yearsUpdated  = 'Updated %s years ago';
+$lang->doc->viewCount     = '%s Visits';
 
 /* Methods list */
 $lang->doc->index            = 'Dashboard';
diff --git a/module/doc/lang/en.php b/module/doc/lang/en.php
index c869e64820..fbf99bdd28 100644
--- a/module/doc/lang/en.php
+++ b/module/doc/lang/en.php
@@ -155,6 +155,7 @@ $lang->doc->todayUpdated  = "Today's update";
 $lang->doc->daysUpdated   = 'Updated %s days ago';
 $lang->doc->monthsUpdated = 'Updated %s months ago';
 $lang->doc->yearsUpdated  = 'Updated %s years ago';
+$lang->doc->viewCount     = '%s Visits';
 
 /* Methods list */
 $lang->doc->index            = 'Dashboard';
diff --git a/module/doc/lang/fr.php b/module/doc/lang/fr.php
index 3ae37ca261..516e6b65a2 100644
--- a/module/doc/lang/fr.php
+++ b/module/doc/lang/fr.php
@@ -155,6 +155,7 @@ $lang->doc->todayUpdated  = "Today's update";
 $lang->doc->daysUpdated   = 'Updated %s days ago';
 $lang->doc->monthsUpdated = 'Updated %s months ago';
 $lang->doc->yearsUpdated  = 'Updated %s years ago';
+$lang->doc->viewCount     = '%s Visits';
 
 /* Methods list */
 $lang->doc->index            = 'Dashboard';
diff --git a/module/doc/lang/zh-cn.php b/module/doc/lang/zh-cn.php
index 4796fa3632..f687d1d1b3 100644
--- a/module/doc/lang/zh-cn.php
+++ b/module/doc/lang/zh-cn.php
@@ -155,6 +155,7 @@ $lang->doc->todayUpdated  = '今天更新';
 $lang->doc->daysUpdated   = '%s天前更新';
 $lang->doc->monthsUpdated = '%s月前更新';
 $lang->doc->yearsUpdated  = '%s年前更新';
+$lang->doc->viewCount     = '%s次浏览';
 
 /* 方法列表。*/
 $lang->doc->index            = '仪表盘';

From beffe827090726867e5fd3394159a0645627731a Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Fri, 14 Apr 2023 16:11:06 +0800
Subject: [PATCH 2/4] * Code for task #43816.

---
 module/block/control.php                      |  7 ++-
 .../block/view/doccollectlistblock.html.php   | 51 +++++++++++++++++++
 module/block/view/docviewlistblock.html.php   |  4 +-
 module/doc/lang/de.php                        |  1 +
 module/doc/lang/en.php                        |  1 +
 module/doc/lang/fr.php                        |  1 +
 module/doc/lang/zh-cn.php                     |  1 +
 7 files changed, 63 insertions(+), 3 deletions(-)

diff --git a/module/block/control.php b/module/block/control.php
index 288a1d2848..2f9f3742b6 100755
--- a/module/block/control.php
+++ b/module/block/control.php
@@ -2123,7 +2123,7 @@ class block extends control
         $this->app->loadClass('pager', $static = true);
         $pager = new pager(0, 6, 1);
 
-        $this->view->docList = $this->loadModel('doc')->getMineList('view', 'all', 'views_desc', $pager);
+        $this->view->docList = $this->loadModel('doc')->getDocsByBrowseType('all', 0, 0,'views_desc', $pager);
     }
 
     /**
@@ -2134,6 +2134,11 @@ class block extends control
      */
     public function printDocCollectListBlock()
     {
+        /* Load pager. */
+        $this->app->loadClass('pager', $static = true);
+        $pager = new pager(0, 6, 1);
+
+        $this->view->docList = $this->loadModel('doc')->getDocsByBrowseType('all', 0, 0, 'collects_desc', $pager);
     }
 
     /**
diff --git a/module/block/view/doccollectlistblock.html.php b/module/block/view/doccollectlistblock.html.php
index e69de29bb2..6c966fc7c9 100644
--- a/module/block/view/doccollectlistblock.html.php
+++ b/module/block/view/doccollectlistblock.html.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * The doccollectlistblock view file of block module of ZenTaoPMS.
+ *
+ * @copyright   Copyright 2009-2023 禅道软件（青岛）有限公司(ZenTao Software (Qingdao) Co., Ltd. www.cnezsoft.com)
+ * @license     ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html)
+ * @author      Shujie Tian <tianshujie@easycorp.ltd>
+ * @package     block
+ * @version     $Id$
+ * @link        https://www.zentao.net
+ */
+?>
+<style>
+.block-doccollectlist .panel-body {padding-top: 0px;}
+.block-doccollectlist .doc-list > .doc-title {display: flex; overflow: hidden; text-overflow: clip; white-space: nowrap; padding: 8px 0;}
+.block-doccollectlist .doc-list > .doc-title > .label-rank {margin-right: 10px; padding-top: 1px; border: unset; color: #2E7FFF; background-color: #D5E5FF;}
+.block-doccollectlist .doc-list > .doc-title > .label-rank-1 {color: #FC5959; background-color: #FFE2D9;}
+.block-doccollectlist .doc-list > .doc-title > .label-rank-2 {color: #FF8058; background-color: #FFE2D9;}
+.block-doccollectlist .doc-list > .doc-title > .label-rank-3 {color: #FF9F46; background-color: #FFECDB;}
+.block-doccollectlist .doc-list > .doc-title > a {overflow: hidden; max-width: calc(100% - 30px);}
+.block-doccollectlist .doc-list > .doc-title > .label-collect-count {margin-left: 10px;}
+.block-doccollectlist .doc-list > .doc-title > .label-collect-count > .view-text {color: #838A9D;}
+</style>
+<div class="panel-body">
+  <?php if(empty($docList)):?>
+    <div class='table-empty-tip'><p><span class='text-muted'><?php echo $lang->doc->noDoc;?></p></span></div>
+  <?php else:?>
+  <div class="doc-list">
+    <?php $rank = 1;?>
+    <?php foreach($docList as $doc):?>
+    <div class='doc-title'>
+      <span class="label-pri label-rank label-rank-<?php echo $rank;?>"><?php echo $rank;?></span>
+      <?php
+      if(common::hasPriv('doc', 'view'))
+      {
+          echo html::a($this->createLink('doc', 'view', "docID=$doc->id"), $doc->title, '', "title='{$doc->title}' class='doc-title' data-app='{$this->app->tab}'");
+      }
+      else
+      {
+          echo "<span class='doc-title'>$icon {$doc->title}</span>";
+      }
+      ?>
+      <div class='label-collect-count'>
+        <span class='view-text'><?php echo sprintf($lang->doc->collectCount, $doc->collects);?></span>
+      </div>
+    </div>
+    <?php $rank ++;?>
+    <?php endforeach;?>
+  </div>
+  <?php endif;?>
+</div>
diff --git a/module/block/view/docviewlistblock.html.php b/module/block/view/docviewlistblock.html.php
index ba9f5a9645..dfee048be2 100644
--- a/module/block/view/docviewlistblock.html.php
+++ b/module/block/view/docviewlistblock.html.php
@@ -12,8 +12,8 @@
 ?>
 <style>
 .block-docviewlist .panel-body {padding-top: 0px;}
-.block-docviewlist .doc-list > .doc-title {display: flex; overflow: hidden; text-overflow: clip; white-space: nowrap; padding: 10px 0;}
-.block-docviewlist .doc-list > .doc-title > .label-rank {margin-right: 10px; padding-top: 1px; border: unset;}
+.block-docviewlist .doc-list > .doc-title {display: flex; overflow: hidden; text-overflow: clip; white-space: nowrap; padding: 8px 0;}
+.block-docviewlist .doc-list > .doc-title > .label-rank {margin-right: 10px; padding-top: 1px; border: unset; color: #2E7FFF; background-color: #D5E5FF;}
 .block-docviewlist .doc-list > .doc-title > .label-rank-1 {color: #FC5959; background-color: #FFE2D9;}
 .block-docviewlist .doc-list > .doc-title > .label-rank-2 {color: #FF8058; background-color: #FFE2D9;}
 .block-docviewlist .doc-list > .doc-title > .label-rank-3 {color: #FF9F46; background-color: #FFECDB;}
diff --git a/module/doc/lang/de.php b/module/doc/lang/de.php
index 02799655cb..98981c7fea 100644
--- a/module/doc/lang/de.php
+++ b/module/doc/lang/de.php
@@ -156,6 +156,7 @@ $lang->doc->daysUpdated   = 'Updated %s days ago';
 $lang->doc->monthsUpdated = 'Updated %s months ago';
 $lang->doc->yearsUpdated  = 'Updated %s years ago';
 $lang->doc->viewCount     = '%s Visits';
+$lang->doc->collectCount  = '%s Collections';
 
 /* Methods list */
 $lang->doc->index            = 'Dashboard';
diff --git a/module/doc/lang/en.php b/module/doc/lang/en.php
index fbf99bdd28..0b87f1089d 100644
--- a/module/doc/lang/en.php
+++ b/module/doc/lang/en.php
@@ -156,6 +156,7 @@ $lang->doc->daysUpdated   = 'Updated %s days ago';
 $lang->doc->monthsUpdated = 'Updated %s months ago';
 $lang->doc->yearsUpdated  = 'Updated %s years ago';
 $lang->doc->viewCount     = '%s Visits';
+$lang->doc->collectCount  = '%s Collections';
 
 /* Methods list */
 $lang->doc->index            = 'Dashboard';
diff --git a/module/doc/lang/fr.php b/module/doc/lang/fr.php
index 516e6b65a2..581ad0dc83 100644
--- a/module/doc/lang/fr.php
+++ b/module/doc/lang/fr.php
@@ -156,6 +156,7 @@ $lang->doc->daysUpdated   = 'Updated %s days ago';
 $lang->doc->monthsUpdated = 'Updated %s months ago';
 $lang->doc->yearsUpdated  = 'Updated %s years ago';
 $lang->doc->viewCount     = '%s Visits';
+$lang->doc->collectCount  = '%s Collections';
 
 /* Methods list */
 $lang->doc->index            = 'Dashboard';
diff --git a/module/doc/lang/zh-cn.php b/module/doc/lang/zh-cn.php
index f687d1d1b3..ddadfab0b7 100644
--- a/module/doc/lang/zh-cn.php
+++ b/module/doc/lang/zh-cn.php
@@ -156,6 +156,7 @@ $lang->doc->daysUpdated   = '%s天前更新';
 $lang->doc->monthsUpdated = '%s月前更新';
 $lang->doc->yearsUpdated  = '%s年前更新';
 $lang->doc->viewCount     = '%s次浏览';
+$lang->doc->collectCount  = '%s次收藏';
 
 /* 方法列表。*/
 $lang->doc->index            = '仪表盘';

From 23171d926d64ab8563fa496a56ce79857341e98f Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Fri, 14 Apr 2023 17:09:27 +0800
Subject: [PATCH 3/4] * Fix field problems.

---
 module/upgrade/model.php | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/module/upgrade/model.php b/module/upgrade/model.php
index dc661007d5..e4a1c272c4 100644
--- a/module/upgrade/model.php
+++ b/module/upgrade/model.php
@@ -9075,8 +9075,12 @@ class upgradeModel extends model
         $this->loadModel('doc');
 
         $users = $this->dao->select('account')->from(TABLE_USER)->fetchPairs('account', 'account');
-        $stmt  = $this->dao->select('id,collector')->from(TABLE_DOC)->where('collector')->ne('')->query();
-        while($doc = $stmt->fetch())
+        $docs  = $this->dao->select('id,collector')->from(TABLE_DOC)->where('collector')->ne('')->query();
+
+        $this->dao->update(TABLE_DOC)->set('collector')->eq(0)->where('collector')->eq('')->exec();
+        $this->dao->exec("ALTER TABLE " . TABLE_DOC . " CHANGE `collector` `collects` smallint unsigned NOT NULL DEFAULT '0'");
+
+        foreach($docs as $doc)
         {
             foreach(explode(',', $doc->collector) as $collector)
             {
@@ -9087,9 +9091,6 @@ class upgradeModel extends model
             }
         }
 
-        $this->dao->update(TABLE_DOC)->set('collector')->eq(0)->where('collector')->eq('')->exec();
-        $this->dao->exec("ALTER TABLE " . TABLE_DOC . " CHANGE `collector` `collects` smallint unsigned NOT NULL DEFAULT '0'");
-
         return true;
     }
 }

From 8fbab2b84fa4ce1042d02b11b4792058f54be84d Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Fri, 14 Apr 2023 17:31:02 +0800
Subject: [PATCH 4/4] * Modify upgrade program.

---
 module/upgrade/model.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/module/upgrade/model.php b/module/upgrade/model.php
index e4a1c272c4..ed9ef1281b 100644
--- a/module/upgrade/model.php
+++ b/module/upgrade/model.php
@@ -9075,9 +9075,9 @@ class upgradeModel extends model
         $this->loadModel('doc');
 
         $users = $this->dao->select('account')->from(TABLE_USER)->fetchPairs('account', 'account');
-        $docs  = $this->dao->select('id,collector')->from(TABLE_DOC)->where('collector')->ne('')->query();
+        $docs  = $this->dao->select('id,collector')->from(TABLE_DOC)->where('collector')->ne('')->fetchAll();
 
-        $this->dao->update(TABLE_DOC)->set('collector')->eq(0)->where('collector')->eq('')->exec();
+        $this->dao->update(TABLE_DOC)->set('collector')->eq(0)->exec();
         $this->dao->exec("ALTER TABLE " . TABLE_DOC . " CHANGE `collector` `collects` smallint unsigned NOT NULL DEFAULT '0'");
 
         foreach($docs as $doc)