From 7a2c83f5bce4b740d8b36e7bda27733185d54e68 Mon Sep 17 00:00:00 2001
From: holan20180123 <56391770@qq.com>
Date: Thu, 18 Mar 2021 09:02:48 +0800
Subject: [PATCH]  * Finish task #36760.

---
 module/block/control.php    |  3 +-
 module/my/js/doc.js         | 19 ++++++++++
 module/my/view/doc.html.php | 73 +++++++++++++++++++++++++++++++++++++
 3 files changed, 94 insertions(+), 1 deletion(-)
 create mode 100644 module/my/js/doc.js
 create mode 100644 module/my/view/doc.html.php

diff --git a/module/block/control.php b/module/block/control.php
index 8388eca3f7..97b8c240ed 100644
--- a/module/block/control.php
+++ b/module/block/control.php
@@ -1687,7 +1687,8 @@ class block extends control
             $stmt = $this->dao->select('*')->from(TABLE_TODO)
                 ->where("(assignedTo = '{$this->app->user->account}' or (account='{$this->app->user->account}'))")
                 ->andWhere('cycle')->eq(0)
-                ->orderBy('`date`');
+                ->andWhere('status')->eq('wait')
+                ->orderBy('`date` desc');
             if(isset($params->todoNum)) $stmt->limit($params->todoNum);
             $todos = $stmt->fetchAll();
 
diff --git a/module/my/js/doc.js b/module/my/js/doc.js
new file mode 100644
index 0000000000..ef9e5db6f3
--- /dev/null
+++ b/module/my/js/doc.js
@@ -0,0 +1,19 @@
+$('.ajaxCollect').click(function (event) {
+    var obj = $(this);
+    var url = obj.data('url');
+    $.get(url, function(response)
+    {
+        if(response.status == 'yes')
+        {
+            obj.children('i').removeClass().addClass('icon icon-star text-yellow');
+            obj.parent().prev().children('.file-name').children('i').remove('.icon');
+            obj.parent().prev().children('.file-name').prepend('<i class="icon icon-star text-yellow"></i> ');
+        }
+        else
+        {
+            obj.children('i').removeClass().addClass('icon icon-star-empty');
+            obj.parent().prev().children('.file-name').children('i').remove(".icon");
+        }
+    }, 'json');
+    return false;
+});
diff --git a/module/my/view/doc.html.php b/module/my/view/doc.html.php
new file mode 100644
index 0000000000..b584afeabd
--- /dev/null
+++ b/module/my/view/doc.html.php
@@ -0,0 +1,73 @@
+<?php
+/**
+ * The project view file of my module of ZenTaoPMS.
+ *
+ * @copyright   Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
+ * @license     ZPL (http://zpl.pub/page/zplv12.html)
+ * @author      Chunsheng Wang <chunsheng@cnezsoft.com>
+ * @package     my
+ * @version     $Id
+ * @link        http://www.zentao.net
+ */
+?>
+<?php include '../../common/view/header.html.php';?>
+<?php js::set('mode', 'doc');?>
+<div id="mainMenu" class="clearfix">
+  <div class="btn-toolbar pull-left">
+    <?php
+    $recTotalLabel = " <span class='label label-light label-badge'>{$pager->recTotal}</span>";
+    echo html::a(inlink($app->rawMethod, "mode=doc&type=openedbyme"),   "<span class='text'>{$lang->doc->openedByMe}</span>" . ($type == 'openedbyme'   ? $recTotalLabel : ''),   '', "class='btn btn-link" . ($type == 'openedbyme'   ? ' btn-active-text' : '') . "'");
+    echo html::a(inlink($app->rawMethod, "mode=doc&type=editedbyme"), "<span class='text'>{$lang->doc->editedByMe}</span>" . ($type == 'editedbyme' ? $recTotalLabel : ''), '', "class='btn btn-link" . ($type == 'editedbyme' ? ' btn-active-text' : '') . "'");
+    ?>
+  </div>
+</div>
+<div id="mainContent" class='main-table'>
+  <?php if(empty($docs)):?>
+  <div class="table-empty-tip">
+    <p>
+      <span class="text-muted"><?php echo $lang->project->empty;?></span>
+    </p>
+  </div>
+  <?php else:?>
+  <form class='main-table' id='projectForm' method='post' data-ride='table' data-nested='true' data-checkable='false'>
+    <table class='table table-fixed' id='docList'>
+      <thead>
+        <tr>
+          <th class="c-name"><?php echo $lang->doc->title;?></th>
+          <th class="c-num"><?php echo $lang->doc->size;?></th>
+          <th class="c-user"><?php echo $lang->doc->addedBy;?></th>
+          <th class="c-datetime"><?php echo $lang->doc->addedDate;?></th>
+          <th class="c-datetime"><?php echo $lang->doc->editedDate;?></th>
+          <th class="w-90px text-center"><?php echo $lang->actions;?></th>
+        </tr>
+      </thead>
+      <tbody id='docTableList'>
+        <?php foreach($docs as $doc):?>
+        <?php $star = strpos($doc->collector, ',' . $this->app->user->account . ',') !== false ? 'icon-star text-yellow' : 'icon-star-empty';?>
+        <?php $collectTitle = strpos($doc->collector, ',' . $this->app->user->account . ',') !== false ? $lang->doc->cancelCollection : $lang->doc->collect;?>
+        <tr>
+          <td class="c-name"><?php echo html::a($this->createLink('doc', 'view', "docID=$doc->id&version=0&from={$lang->navGroup->doc}"), "<i class='icon icon-file-text text-muted'></i> &nbsp;" . $doc->title, '', "title={$doc->title}");?></td>
+          <td class="c-num"><?php echo $doc->fileSize ? $doc->fileSize : '-';?></td>
+          <td class="c-user"><?php echo zget($users, $doc->addedBy);?></td>
+          <td class="c-datetime"><?php echo formatTime($doc->addedDate, 'y-m-d');?></td>
+          <td class="c-datetime"><?php echo formatTime($doc->editedDate, 'y-m-d');?></td>
+          <td class="c-actions">
+            <?php if(common::canBeChanged('doc', $doc)):?>
+            <?php if(common::hasPriv('doc', 'collect')):?>
+            <a data-url="<?php echo $this->createLink('doc', 'collect', "objectID=$doc->id&objectType=doc");?>" title="<?php echo $collectTitle;?>" class='btn btn-link ajaxCollect'><i class='icon <?php echo $star;?>'></i></a>
+            <?php endif;?>
+            <?php common::printLink('doc', 'edit', "docID=$doc->id&comment=false&from={$lang->navGroup->doc}", "<i class='icon icon-edit'></i>", '', "title='{$lang->edit}' class='btn btn-link'")?>
+            <?php common::printLink('doc', 'delete', "docID=$doc->id&confirm=no&from={$lang->navGroup->doc}", "<i class='icon icon-trash'></i>", 'hiddenwin', "title='{$lang->delete}' class='btn btn-link'")?>
+            <?php endif;?>
+          </td>
+        </tr>
+        <?php endforeach;?>
+      </tbody>
+    </table>
+    <div class='table-footer'>
+      <?php $pager->show('right', 'pagerjs');?>
+    </div>
+  </form>
+  <?php endif;?>
+</div>
+<?php include '../../common/view/footer.html.php';?>