Merge branch 'master' of github.com:easysoft/zentaopms

module/file/lang/en.php

@@ -20,7 +20,7 @@ $lang->file->delete        = 'Delete File';
 $lang->file->label         = 'Label:';
 $lang->file->maxUploadSize = "<span class='text-red'>%s</span>";
 $lang->file->applyTemplate = "Apply Template";
-$lang->file->tplTitle      = "Name";
+$lang->file->tplTitle      = "Template Name";
 $lang->file->setPublic     = "Set Public Template";
 $lang->file->exportFields  = "Fields";
 $lang->file->exportRange   = "Data";

module/file/view/export.html.php

@@ -155,7 +155,7 @@ if($isCustomExport)
         <table class="table table-form">
           <tbody>
             <tr>
-              <th><?php echo $lang->file->fileName;?></th>
+              <th class='w-120px'><?php echo $lang->file->fileName;?></th>
               <td class="w-300px"><?php echo html::input('fileName', isset($fileName) ? $fileName : '', "class='form-control' autofocus placeholder='{$lang->file->untitled}'");?></td>
               <td></td>
             </tr>

module/task/js/finish.js

@@ -0,0 +1,11 @@
+$(function()
+{
+    $('#currentConsumed').keyup(function()
+    {
+        var currentConsumed = $(this).val();
+        if(!parseInt(currentConsumed)) currentConsumed = 0;
+        var total = parseInt(currentConsumed) + parseInt(consumed);
+        $('#totalConsumed').html(total);
+        $('#consumed').val(total);
+    })        
+})

module/task/lang/en.php

@@ -185,7 +185,7 @@ $lang->task->noTask                = 'No tasks yet. ';
 $lang->task->createDenied          = 'Create Task is denied in this project';
 
 $lang->task->error = new stdclass();
-$lang->task->error->consumedNumber   = '"Hours Cost" must be numbers.';
+$lang->task->error->consumedNumber   = '"Current Cost" must be numbers.';
 $lang->task->error->estimateNumber   = '"Estimates" must be numbers.';
 $lang->task->error->consumedSmall    = '"Hours Cost" must be > the last number.';
 $lang->task->error->consumedThisTime = 'Please enter "Hours Cost"';

module/task/lang/zh-cn.php

@@ -185,7 +185,7 @@ $lang->task->noTask                = '暂时没有任务。';
 $lang->task->createDenied          = '你不能在该项目添加任务';
 
 $lang->task->error                   = new stdclass();
-$lang->task->error->consumedNumber   = '"已经消耗"必须为数字';
+$lang->task->error->consumedNumber   = '"本次消耗"必须为数字';
 $lang->task->error->estimateNumber   = '"预计剩余"必须为数字';
 $lang->task->error->consumedSmall    = '"已经消耗"必须大于之前消耗';
 $lang->task->error->consumedThisTime = '请填写"工时"';

module/task/model.php

@@ -1289,7 +1289,7 @@ class taskModel extends model
             ->remove('comment,files,labels,currentConsumed')
             ->get();
 
-        if(!is_numeric($task->consumed))
+        if(!is_numeric($this->post->currentConsumed))
         {
             dao::$errors[] = $this->lang->task->error->consumedNumber;
             return false;
@@ -1327,7 +1327,7 @@ class taskModel extends model
             ->setDefault('date', date(DT_DATE1))
             ->setIF($this->post->finishedDate, 'date', $this->post->finishedDate)
             ->setDefault('left', 0)
-            ->remove('finishedDate,comment,assignedTo,files,labels,consumed')
+            ->remove('finishedDate,comment,assignedTo,files,labels,consumed,currentConsumed')
             ->get();
 
         $estimate->consumed = $consumed;

module/task/view/finish.html.php

@@ -35,7 +35,7 @@
     <form method='post' enctype='multipart/form-data' target='hiddenwin'>
       <table class='table table-form'>
         <tr>
-          <?php $colWidth = $app->getClientLang() == 'en' ? 'w-120px' : 'w-80px';?>
+          <?php $colWidth = $app->getClientLang() == 'en' ? 'w-120px' : 'w-100px';?>
           <th class='<?php echo $colWidth;?>'><?php echo !empty($task->team) ? $lang->task->common . $lang->task->consumed : $lang->task->hasConsumed;?></th>
           <td class='w-p25-f'><?php echo $task->consumed;?> <?php echo $lang->workingHour;?></td>
           <td></td>
@@ -55,11 +55,11 @@
         <tr>
           <th><?php echo empty($task->team) ? $lang->task->consumed : $lang->task->myConsumed;?></th>
           <td>
-            <?php $consumed = empty($task->team) ? $task->consumed : $task->myConsumed;?>
-            <?php 
-              echo "<span id='totalConsumed'>" . $consumed . "</span>" . $lang->workingHour . html::hidden('consumed', $consumed);
-              js::set('consumed', $consumed);
-            ?>
+          <?php $consumed = empty($task->team) ? $task->consumed : $task->myConsumed;?>
+          <?php 
+          echo "<span id='totalConsumed'>" . $consumed . "</span>" . $lang->workingHour . html::hidden('consumed', $consumed);
+          js::set('consumed', $consumed);
+          ?>
           </td>
         </tr>
         <tr>

module/testcase/config.php

@@ -153,12 +153,12 @@ $config->testcase->datatable->fieldList['lastRunDate']['required'] = 'no';
 
 $config->testcase->datatable->fieldList['lastRunResult']['title']    = 'lastRunResult';
 $config->testcase->datatable->fieldList['lastRunResult']['fixed']    = 'no';
-$config->testcase->datatable->fieldList['lastRunResult']['width']    = '50';
+$config->testcase->datatable->fieldList['lastRunResult']['width']    = '70';
 $config->testcase->datatable->fieldList['lastRunResult']['required'] = 'no';
 
 $config->testcase->datatable->fieldList['status']['title']    = 'statusAB';
 $config->testcase->datatable->fieldList['status']['fixed']    = 'no';
-$config->testcase->datatable->fieldList['status']['width']    = '50';
+$config->testcase->datatable->fieldList['status']['width']    = '70';
 $config->testcase->datatable->fieldList['status']['required'] = 'no';
 
 $config->testcase->datatable->fieldList['lastEditedBy']['title']    = 'lastEditedBy';