Skip to content

Commit

Permalink
remove-checkpoints
Browse files Browse the repository at this point in the history
  • Loading branch information
@pavlosb
pavlosb committed Apr 26, 2024
1 parent 63fd3a5 commit a50d1c2
Show file tree
Hide file tree
Showing 2 changed files with 56 additions and 7 deletions.
4 changes: 4 additions & 0 deletions application/controllers/Inspection.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -475,6 +475,10 @@ public function inspection_save()
$updata['s1score_inspection'] = $this->itindata_model->get_sectionscore($this->input->post('inspectionid_insres'), 1);
$updata['s2score_inspection'] = $this->itindata_model->get_sectionscore($this->input->post('inspectionid_insres'), 12);
$updata['s3score_inspection'] = $this->itindata_model->get_sectionscore($this->input->post('inspectionid_insres'), 16);
$updata['s1pen_inspection'] = $this->input->post('pensect1');
$updata['s2pen_inspection'] = $this->input->post('pensect2');
$updata['s3pen_inspection'] = $this->input->post('pensect3');

$this->itindata_model->upd_inspection($this->input->post('inspectionid_insres'), $updata);
redirect('inspection/inspections_list', 'refresh');
} else {
Expand Down
59 changes: 52 additions & 7 deletions application/views/inspectionform.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,17 +124,18 @@

<div class="form-group row pt-3">
<input type=hidden name="chpsect[<?= $cp['id_cp']; ?>]" value ="<?= $cp['mainsectid']; ?>">
<input type=hidden name="points[<?= $cp['id_cp']; ?>]" data-sectpen="<?= $cp['mainsectid']; ?>" value ="<?= $cp['points_cp']; ?>">
<label for="chpsect[<?= $cp['id_cp']; ?>]" class="col-sm-7 col-form-label "><?= $cp[$name_cp]; ?><small class="form-text text-muted"><?= $cp[$helptext_cp]; ?></small></label>
<div class="col-sm-5 text-center text-sm-right">
<div class="btn-group btn-group-toggle " data-toggle="buttons">
<label class="btn btnnok btn-secondary <?php if (isset($inspscore) && $inspscore[$cp['id_cp']] == -1) { echo "active"; } ?>">
<input type="radio" data-sect="<?= $cp['mainsectid']; ?>" class="do-not-calc" name="checkpoint[<?= $cp['id_cp']; ?>]" id="option1" value="-1" <?php if (isset($inspscore) && $inspscore[$cp['id_cp']] == -1) { echo "checked"; } ?> autocomplete="off"><i class="fal fa-times-square"></i>
<input type="radio" data-sect="<?= $cp['mainsectid']; ?>" data-cpid = "<?= $cp['id_cp']; ?>" data-ptscp="0" class="do-not-calc" name="checkpoint[<?= $cp['id_cp']; ?>]" id="option1[<?= $cp['id_cp']; ?>]" data-substract = "<?= $cp['points_cp']; ?>" value="-1" <?php if (isset($inspscore) && $inspscore[$cp['id_cp']] == -1) { echo "checked"; } ?> autocomplete="off"><i class="fal fa-times-square"></i>
</label>
<label class="btn btnna btn-secondary <?php if (!isset($inspscore) || (isset($inspscore) && $inspscore[$cp['id_cp']] == 0)) { echo "active"; } ?>">
<input type="radio" data-sect="<?= $cp['mainsectid']; ?>" name="checkpoint[<?= $cp['id_cp']; ?>]" id="option2" value="0" autocomplete="off" <?php if (!isset($inspscore) || (isset($inspscore) && $inspscore[$cp['id_cp']] == 0)) { echo "checked"; } ?>> <i class="fal fa-stop"></i>
<input type="radio" data-sect="<?= $cp['mainsectid']; ?>" data-cpid = "<?= $cp['id_cp']; ?>" data-ptscp="<?= $cp['points_cp']; ?>" name="checkpoint[<?= $cp['id_cp']; ?>]" id="option2[<?= $cp['id_cp']; ?>]" value="0" autocomplete="off" <?php if (!isset($inspscore) || (isset($inspscore) && $inspscore[$cp['id_cp']] == 0)) { echo "checked"; } ?>> <i class="fal fa-stop"></i>
</label>
<label class="btn btnok btn-secondary <?php if (isset($inspscore) && $inspscore[$cp['id_cp']] == $cp['points_cp']) { echo "active"; } ?>">
<input type="radio" data-sect="<?= $cp['mainsectid']; ?>" name="checkpoint[<?= $cp['id_cp']; ?>]" id="option3" <?php if (isset($inspscore) && $inspscore[$cp['id_cp']] == $cp['points_cp']) { echo "checked"; } ?> value ="<?= $cp['points_cp']; ?>"autocomplete="off"> <i class="fal fa-check-square"></i>
<input type="radio" data-sect="<?= $cp['mainsectid']; ?>" data-cpid = "<?= $cp['id_cp']; ?>" data-ptscp="0" name="checkpoint[<?= $cp['id_cp']; ?>]" id="option3[<?= $cp['id_cp']; ?>]" <?php if (isset($inspscore) && $inspscore[$cp['id_cp']] == $cp['points_cp']) { echo "checked"; } ?> data-substract = "<?= $cp['points_cp']; ?>" value ="<?= $cp['points_cp']; ?>"autocomplete="off"> <i class="fal fa-check-square"></i>
</label>

</div>
Expand All @@ -158,7 +159,9 @@
$scp = $cp['name_section'];
endforeach ?>
<div class="form-group row" id="imagefields"></div>

<input type=hidden name="pensect1" value ="0">
<input type=hidden name="pensect2" value ="0">
<input type=hidden name="pensect3" value ="0">
<button type="submit" class="btn btn-lg btn-primary float-right"><?= $this->lang->line('submit'); ?></button>
<?php echo form_close();?>
</div>
Expand Down Expand Up @@ -371,16 +374,28 @@ function uploadFile() {
$('#closecamera').hide();
$('input:radio').change(function ()
{


var total1 = 0;
var total2 = 0;
var total3 = 0;
var pensect1 = 0;
var pensect2 = 0;
var pensect3 = 0;
$totscore1 = 112;
$totscore2 = 62;
$totscore2 = 16;
$newscore1 = 0;

$('input:radio:checked').each(function(){
$cpid = $(this).data("cpid");
$ptscp = isNaN(parseInt($(this).data("ptscp"))) ? 0 : parseInt($(this).data("ptscp"));
$('[name="points['+$cpid +']"]').val($ptscp);
if (!$(this).hasClass('do-not-calc')) {
if ($(this).data("sect") === 1) {
total1 += isNaN(parseInt($(this).val())) ? 0 : parseInt($(this).val());
total1pc = 100 * (total1 / 112);
$("#score1").text(total1pc.toFixed(2) + '%');
$("#score1").text(total1pc.toFixed(2) + '%');
$("#score4").text(total1pc.toFixed(2) + '%');
}
if ($(this).data("sect") === 12) {
Expand All @@ -396,7 +411,20 @@ function uploadFile() {
$("#score6").text(total3pc.toFixed(2) + '%');
}
}
});
});

$("input[data-sectpen='1']").each(function(){
pensect1 += parseInt($(this).val());
});
$("input[data-sectpen='12']").each(function(){
pensect2 += parseInt($(this).val());
});
$("input[data-sectpen='16']").each(function(){
pensect3 += parseInt($(this).val());
});
$('[name="pensect1"]').val(pensect1);
$('[name="pensect2"]').val(pensect2);
$('[name="pensect3"]').val(pensect3);

gauge1.set(total1);
AnimationUpdater.run();
Expand Down Expand Up @@ -516,11 +544,16 @@ function uploadFile() {
gauge6.animationSpeed = 32; // set animation speed (32 is default value)
gauge6.set(0); // set actual value


var pensect1 = 0;
var pensect2 = 0;
var pensect3 = 0;
var total1 = 0;
var total2 = 0;
var total3 = 0;
$('input:radio:checked').each(function(){
$cpid = $(this).data("cpid");
$ptscp = isNaN(parseInt($(this).data("ptscp"))) ? 0 : parseInt($(this).data("ptscp"));
$('[name="points['+$cpid +']"]').val($ptscp);
if (!$(this).hasClass('do-not-calc')) {
if ($(this).data("sect") === 1) {
total1 += isNaN(parseInt($(this).val())) ? 0 : parseInt($(this).val());
Expand All @@ -542,6 +575,18 @@ function uploadFile() {
}
}
});
$("input[data-sectpen='1']").each(function(){
pensect1 += parseInt($(this).val());
});
$("input[data-sectpen='12']").each(function(){
pensect2 += parseInt($(this).val());
});
$("input[data-sectpen='16']").each(function(){
pensect3 += parseInt($(this).val());
});
$('[name="pensect1"]').val(pensect1);
$('[name="pensect2"]').val(pensect2);
$('[name="pensect3"]').val(pensect3);

gauge1.set(total1);
AnimationUpdater.run();
Expand Down

0 comments on commit a50d1c2

Please sign in to comment.