Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Finished task#7021.

Browse Source
This commit is contained in:
滔哥
2018-10-18 09:22:29 +08:00
parent fc318f817f
commit 98ec5b63e7
2 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/report/view/productsummary.html.php
+16 -16
View File
@@ -9,21 +9,6 @@
</div>
</div>
<div class='main-col'>
<div class='cell'>
<div class="table-row" id='conditions'>
<div class="col-xs text-right text-gray text-middle"><?php echo $lang->report->conditions?></div>
<div class='col'>
<div class="checkbox-primary inline-block">
<input type="checkbox" name="closedProduct" value="closedProduct" id="closedProduct" <?php if(strpos($conditions, 'closedProduct') !== false) echo "checked='checked'"?> />
<label for="closedProduct"><?php echo $lang->report->closedProduct?></label>
</div>
<div class="checkbox-primary inline-block">
<input type="checkbox" name="overduePlan" value="overduePlan" id="overduePlan" <?php if(strpos($conditions, 'overduePlan') !== false) echo "checked='checked'"?> />
<label for="overduePlan"><?php echo $lang->report->overduePlan?></label>
</div>
</div>
</div>
</div>
<?php if(empty($products)):?>
<div class="cell">
<div class="table-empty-tip">
@@ -34,7 +19,22 @@
<div class='cell'>
<div class='panel'>
<div class="panel-heading">
<div class="panel-title"><?php echo $title;?></div>
<div class="panel-title">
<div class="table-row" id='conditions'>
<div class="col-xs"><?php echo $title;?></div>
<div class="col-xs text-right text-gray text-middle"><?php echo $lang->report->conditions?></div>
<div class='col'>
<div class="checkbox-primary inline-block">
<input type="checkbox" name="closedProduct" value="closedProduct" id="closedProduct" <?php if(strpos($conditions, 'closedProduct') !== false) echo "checked='checked'"?> />
<label for="closedProduct"><?php echo $lang->report->closedProduct?></label>
</div>
<div class="checkbox-primary inline-block">
<input type="checkbox" name="overduePlan" value="overduePlan" id="overduePlan" <?php if(strpos($conditions, 'overduePlan') !== false) echo "checked='checked'"?> />
<label for="overduePlan"><?php echo $lang->report->overduePlan?></label>
</div>
</div>
</div>
</div>
<nav class="panel-actions btn-toolbar"></nav>
</div>
<div data-ride='table'>
module/report/view/projectdeviation.html.php
+1 -1
View File
@@ -51,7 +51,7 @@
<?php foreach($projects as $id =>$project):?>
<tr class="text-center">
<td><?php echo $id;?></td>
<td class="text-left"><?php echo html::a($this->createLink('project', 'view', "projectID=$id"), $project->name);?></td>
<td class="text-left" title="<?php echo $project->name;?>"><?php echo html::a($this->createLink('project', 'view', "projectID=$id"), $project->name);?></td>
<td><?php echo $project->estimate;?></td>
<td><?php echo $project->consumed;?></td>
<?php $deviation = $project->consumed - $project->estimate;?>