Merge branch 'sprint/220_liumengyi_fixissue' into 'master'

* Fix issue #695, #696.

See merge request easycorp/zentaopms!4675

module/execution/control.php

@@ -2300,6 +2300,7 @@ class execution extends control
             $end       = helper::today();
             $dateList  = date::getDateList($begin, $end, 'Y-m-d', 'noweekend');
             $chartData = $this->execution->buildCFDData($executionID, $dateList, 'task');
+            if(isset($chartData['line'])) $chartData['line'] = array_reverse($chartData['line']);
 
             $this->view->begin = helper::safe64Encode(urlencode($begin));
             $this->view->end   = helper::safe64Encode(urlencode($end));

module/execution/view/view.html.php

@@ -269,8 +269,10 @@
                 <p>
                   <?php if($execution->deleted):?>
                   <span class='label label-danger label-outline'><?php echo $lang->execution->deleted;?></span>
-                  <?php endif; ?>
+                  <?php endif;?>
+                  <?php if(!empty($execution->lifetime)):?>
                   <span class="label label-primary label-outline"><?php echo zget($lang->execution->lifeTimeList, $execution->lifetime);?></span>
+                  <?php endif;?>
                   <?php if(isset($execution->delay)):?>
                   <span class="label label-danger label-outline"><?php echo $lang->execution->delayed;?></span>
                   <?php else:?>