From a6968f3171b413244fe2b4898596328d87796a04 Mon Sep 17 00:00:00 2001
From: leiyong <1549684884@qq.com>
Date: Wed, 23 Sep 2020 17:46:45 +0800
Subject: [PATCH] * Add program project the delete method.

---
 module/program/control.php              | 29 +++++++++++++++++++++++++
 module/program/view/pgmproject.html.php |  3 ++-
 module/program/view/prjbrowse.html.php  |  3 ++-
 3 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/module/program/control.php b/module/program/control.php
index 0329bfaef3..2c08f8ddb8 100644
--- a/module/program/control.php
+++ b/module/program/control.php
@@ -1381,6 +1381,35 @@ class program extends control
         $this->display('project', 'activate');
     }
 
+    /**
+     * Delete a project.
+     *
+     * @param  int     $projectID
+     * @param  string  $from
+     * @param  int     $programID
+     * @access public
+     * @return void
+     */
+    public function PRJDelete($projectID, $confirm = 'no', $from = 'PRJ', $programID = 0)
+    {
+        if($confirm == 'no')
+        {
+            $project = $this->program->getPRJByID($projectID);
+            echo js::confirm(sprintf($this->lang->program->confirmDelete, $project->name), $this->createLink('program', 'PRJDelete', "projectID=$projectID&confirm=yes&from=$from&programID=$programID"));
+            die();
+        }
+        else
+        {
+            $this->project->delete(TABLE_PROJECT, $projectID);
+            $this->dao->update(TABLE_DOCLIB)->set('deleted')->eq(1)->where('project')->eq($projectID)->exec();
+            $this->project->updateUserView($projectID);
+            $this->session->set('project', '');
+
+            $link = $from == 'PRJ' ? inLink('PRJBrowse', 'programID=' . $programID) : inLink('PGMProject', 'programID=' . $programID);
+            die(js::locate($link, 'parent'));
+        }
+    }
+
     /**
      * Update projects order.
      *
diff --git a/module/program/view/pgmproject.html.php b/module/program/view/pgmproject.html.php
index 8e2a131e67..1ff9546054 100644
--- a/module/program/view/pgmproject.html.php
+++ b/module/program/view/pgmproject.html.php
@@ -50,7 +50,7 @@ js::set('browseType', $browseType);
             <th class='w-60px'><?php echo $lang->program->PRJConsume;?></th>
             <th class='w-60px'><?php echo $lang->program->PRJSurplus;?></th>
             <th class='w-150px'><?php echo $lang->program->PRJProgress;?></th>
-            <th class='w-200px'><?php echo $lang->actions;?></th>
+            <th class='text-center w-210px'><?php echo $lang->actions;?></th>
           </tr>
         </thead>
         <tbody class="sortable" id='projectTableList'>
@@ -86,6 +86,7 @@ js::set('browseType', $browseType);
               <?php common::printIcon('program', 'PRJSuspend', "programID=$project->id", $project, 'list', 'pause', '', 'iframe', true);?>
               <?php common::printIcon('program', 'PRJClose', "programID=$project->id", $project, 'list', 'off', '', 'iframe', true);?>
               <?php if(common::hasPriv('program', 'PRJEdit')) echo html::a($this->createLink("program", "PRJEdit", "programID=$project->id"), "<i class='icon-edit'></i>", '', "class='btn' title='{$lang->edit}'");?>
+              <?php common::printIcon('program', 'PRJDelete', "projectID=$project->id&confirm=no&from=PGM&programID=$programID", $project, 'list', 'trash', 'hiddenwin', '', true);?>
             </td>
           </tr>
           <?php endforeach;?>
diff --git a/module/program/view/prjbrowse.html.php b/module/program/view/prjbrowse.html.php
index 63733d19f3..a9fd9aa205 100644
--- a/module/program/view/prjbrowse.html.php
+++ b/module/program/view/prjbrowse.html.php
@@ -62,7 +62,7 @@ js::set('browseType', $browseType);
             <th class='w-120px'><?php echo $lang->program->end;?></th>
             <th class='w-80px'><?php echo $lang->program->PRJBudget;?></th>
             <th class='w-80px'><?php echo $lang->program->PRJPM;?></th>
-            <th class='w-200px'><?php echo $lang->actions;?></th>
+            <th class='text-center w-210px'><?php echo $lang->actions;?></th>
             <?php if($canOrder):?>
             <th class='w-70px sort-default'><?php common::printOrderLink('order', $orderBy, $vars, $lang->program->PRJUpdateOrder);?></th>
             <?php endif;?>
@@ -89,6 +89,7 @@ js::set('browseType', $browseType);
               <?php common::printIcon('program', 'PRJSuspend', "programID=$project->id", $project, 'list', 'pause', '', 'iframe', true);?>
               <?php common::printIcon('program', 'PRJClose', "programID=$project->id", $project, 'list', 'off', '', 'iframe', true);?>
               <?php if(common::hasPriv('program', 'PRJEdit')) echo html::a($this->createLink("program", "PRJEdit", "programID=$project->id"), "<i class='icon-edit'></i>", '', "class='btn' title='{$lang->edit}'");?>
+              <?php common::printIcon('program', 'PRJDelete', "projectID=$project->id&confirm=no&from=PRJ&programID=$programID", $project, 'list', 'trash', 'hiddenwin', '', true);?>
             </td>
             <?php if($canOrder):?>
               <td class='c-actions sort-handler'><i class="icon icon-move"></i></td>