Overigen/monpas
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tussenopslag

Browse Source
This commit is contained in:
Monique
2021-11-16 11:16:52 +01:00
parent eb0bd12ac8
commit 939e7f69ac
6 changed files with 998 additions and 864 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/monpas/Beheer.php
+9
View File
@@ -138,4 +138,13 @@ class Beheer extends MY_Controller{
"gewicht" => $this->clean_input("gewicht"));
$this->Indicatoren_model->update_record($data, $indicatorid);
}
function disableijkpunt(){
if (!$this->userid ) die;
$ijkpuntid = $this->clean_input("id");
$disabled = $this->clean_input("disabled");
$this->Ijkpunten_model->update_record(['disabled' => $disabled ], $ijkpuntid);
}
}
application/models/monpas/Scorekleuren_model.php
+29
View File
@@ -0,0 +1,29 @@
<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
/**Scorekleuren_model november 2031 */
class Scorekleuren_model extends MY_Model{
protected $tablename = 'tb_scorekleuren';
function __construct(){
parent::__construct();
$models = array('');
$this->load->model($models);
}
function getGemiddeldeKleur($scoretype, $gemiddelde){
$this->sql="SELECT kleurcode, nummer, ondergrens, bovengrens
FROM tb_scorekleuren
WHERE scoretype = {$scoretype}
AND bovengrens > {$gemiddelde}
AND ondergrens <= {$gemiddelde}
AND disabled = 'F' ";
return $this->get_query_row();
}
}
application/views/monpas/pages/monitor.php
+70 -19
View File
@@ -13,10 +13,10 @@
value : selectedOrgversion,
event : {change: fChangeVersion}">
</select>
<!-- <span style="display: inline-block; float:right"-->
<!-- class="glyphicon glyphicon-print"-->
<!-- data-bind="click: fPrint">-->
<!-- </span>-->
<span style="display: inline-block; float:right"
class="glyphicon glyphicon-print"
data-bind="click: fPrint">
</span>
</h4>
<div class="row">
@@ -33,8 +33,15 @@
<tbody data-bind="foreach:listitems">
<tr class="clickable" data-bind="click: $parent.fToonToelichting">
<td style="width:30px; background-color:#6f0b3d; color:#ffffff" data-bind="text:nummer"> </td>
<td style="background-color:#6f0b3d; color:#ffffff" data-bind="text: omschrijving"> </td>
<td style="width:30px; "
data-bind= "text:nummer,
style: {color: disabled()? '#262626' : '#ffffff' ,
backgroundColor: disabled()? '#d9d9d9' : '#6f0b3d' }" >
</td>
<td data-bind= "text: disabled() ? omschrijving + ' (uitgezet)' : omschrijving,
style: {color: disabled()? '#262626' : '#ffffff',
backgroundColor: disabled() ? '#d9d9d9' : '#6f0b3d' }">
</td>
</tr>
<tr>
<td colspan = 2>
@@ -42,24 +49,32 @@
<table style="width:100%">
<thead>
<tr>
<th class="header2" style="width: 3%;padding-left: 2px;text-align:right"> nr </th>
<th class="header2" style="width: 60%;padding-left: 2px">indicator</th>
<th class="header2" style="width: 30%;padding-left: 2px;text-align:left"> score</th>
<th class="header2" style="width: 3%;padding-left: 2px;text-align:right"
data-bind="style: {backgroundColor: disabled() ? '#d9d9d9' : '#e7e2e5'}"> nr
</th>
<th class="header2" style="width: 60%;padding-left: 2px"
data-bind="style: {backgroundColor: disabled() ? '#d9d9d9' : '#e7e2e5'}">indicator
</th>
<th class="header2" style="width: 30%;padding-left: 2px;text-align:left"
data-bind="style: {backgroundColor: disabled() ? '#d9d9d9' : '#e7e2e5'}"> score
</th>
</tr>
</thead>
<tbody data-bind="foreach: indicatorscores">
<tr style="border-bottom: 1px solid #ebebeb">
<td style="text-align:right;vertical-align:top" data-bind="text: nummer">
<td style="text-align:right;vertical-align:top" data-bind="text: nummer,
style: {color: $parent.disabled()? '#d9d9d9' : '#262626' }">
</td>
<td data-bind="text: omschrijving" style="vertical-align:top">
<td data-bind="text: omschrijving,
style: {color: $parent.disabled()? '#d9d9d9' : '#262626' }" style="vertical-align:top">
</td>
<td>
<span data-bind="visible: scoretype==1">
<input class="rapport"
data-bind="textInput: score,
event:{input: $root.fUpdateScoretype12},
enable: $root.editok(),
enable: $root.editok() && $parent.disabled() == false,
attr:{'id' : $index}" />
</span>
<span data-bind="visible: scoretype == 2">
@@ -67,16 +82,31 @@
data-bind="textInput: score,
event:{input: $root.fUpdateScoretype12},
visible: scoretype==2,
enable: $root.editok()" /> %
enable: $root.editok() && $parent.disabled() == false" /> %
</span>
<div data-bind="visible: scoretype==3 || scoretype == 4 || scoretype == 5 || scoretype == 6 || scoretype==7 ">
<!-- ko if: $parent.disabled() == false -->
<!-- ko foreach: $root.scoreopties -->
<!-- ko if: $parent.scoretype == type -->
<input type='radio'
data-bind="checked: $parent.score(), event:{click: $root.fUpdateScoretypeVanaf3.bind($data, $parent.id)}, attr: {'name': $parent.id , 'value': value}, enable: $root.editok()" />
data-bind="checked: $parent.score(),
event:{click: $root.fUpdateScoretypeVanaf3.bind($data, $parent.id)},
attr: {'name': $parent.id , 'value': value},
enable: $root.editok() " />
<span style="vertical-align:top; display: inline-block; margin-left:5px;" data-bind="text: optie"> </span>
<!-- /ko -->
<!-- /ko -->
<!-- /ko -->
<!-- ko if: $parent.disabled() == true -->
<!-- ko foreach: $root.scoreopties -->
<!-- ko if: $parent.scoretype == type -->
<input type='radio'
data-bind="checked: $parent.score(),
enable: false " />
<span style="vertical-align:top; display: inline-block; margin-left:5px;" data-bind="text: optie"> </span>
<!-- /ko -->
<!-- /ko -->
<!-- /ko -->
</td>
</tr>
</tbody>
@@ -97,22 +127,43 @@
<tbody data-bind="foreach: indicatorscores">
<tr style="border-bottom: 1px solid #ebebeb">
<td style="text-align:right;vertical-align:top; border-left: 1px solid #ebebeb;"
data-bind="text: nummer">
data-bind="text: nummer,
style: {color: $parent.disabled()? '#d9d9d9' : '#262626' } ">
</td>
<td data-bind="text: omschrijving, attr: {'colspan': $root.optieslengte()}" style="vertical-align:top; border-right: 1px solid #ebebeb;">
<td data-bind="text: omschrijving,
attr: {'colspan': $root.optieslengte()},
style: {color: $parent.disabled()? '#d9d9d9' : '#262626' }" style="vertical-align:top; border-right: 1px solid #ebebeb;">
</td>
</tr>
<tr style="border-bottom: 1px solid #ebebeb">
<td style="border-left: 1px solid #ebebeb;">
</td>
<!-- ko if: $parent.disabled() == false -->
<!-- ko foreach: $root.scoreopties -->
<td style="border-right: 1px solid #ebebeb;vertical-align:top">
<input style="vertical-align:top; padding-left: 5px;" type='radio'
data-bind="checked: $parent.score(), event:{click: $root.fUpdateScoretypeVanaf3.bind($data, $parent.id)}, attr: {'name': $parent.id , 'value': value}, enable: $root.editok()" />
<p style="vertical-align:top; padding-left: 5px;" data-bind="text: scoretekst"> </p>
data-bind="checked: $parent.score(),
event:{click: $root.fUpdateScoretypeVanaf3.bind($data, $parent.id)},
attr: {'name': $parent.id , 'value': value},
enable: $root.editok()" />
<p style="vertical-align:top; padding-left: 5px;"
data-bind="text: scoretekst">
</p>
</td>
<!-- /ko -->
<!-- /ko -->
<!-- ko if: $parent.disabled() == true -->
<!-- ko foreach: $root.scoreopties -->
<td style="border-right: 1px solid #ebebeb;vertical-align:top">
<input style="vertical-align:top; padding-left: 5px;" type='radio'
data-bind="checked: $parent.score(),
enable: false" />
<p style="vertical-align:top; padding-left: 5px;"
data-bind="text: scoretekst">
</p>
</td>
<!-- /ko -->
<!-- /ko -->
</tr>
</tbody>
application/views/monpas/pages/versies.php
+42 -25
View File
@@ -1,10 +1,9 @@
<div class="col-sm-12 mainpagina submenupage" id ="pagVersies">
<div class='row'>
<div class="col-sm-12 col-md-3" style="border:1px solid #f2f2f2">
<h3>Instrument</h3>
<select style="font-size:1em"
<select style="font-size:1em; max-width: 250px;"
data-bind=" options : modules,
optionsText : 'naam',
value : selectedModule,
@@ -51,10 +50,11 @@
<tr>
<th style="width:5%;padding-left:3px">i</th>
<th style="width:5%"> nr </th>
<th style="width:40%"> omschrijving</th>
<th style="width: 40%">toelichting</th>
<th style="width: 5%"> del</th>
<th style="widht: 5%">add</th>
<th style="width:25%"> omschrijving</th>
<th style="width: 35%">toelichting</th>
<th style="width: 4%"> del</th>
<th style="width: 6%"> disable</th>
<th style="width: 5%"> add</th>
</tr>
</thead>
<tbody data-bind="foreach: ijkpunten">
@@ -64,27 +64,36 @@
data-bind="click: $parent.fToggleIndicatoren, css:{ 'closebutton' : toonindics(), 'openbutton': !toonindics()}"></button>
</td>
<td style="vertical-align: top">
<input class= 'integer' data-bind="textInput:nummer, event:{input:$parent.fUpdateIJkpunt}"/>
<input class= 'integer' data-bind="textInput:nummer,
event:{input:$parent.fUpdateIJkpunt},
style: {color: disabled()? '#d9d9d9' : '#262626' }"/>
</td>
<td><textarea style="width:99%" data-bind="textInput:omschrijving, event:{input: $parent.fUpdateIJkpunt}" ></textarea>
<td><textarea style="width:99%" data-bind="textInput: omschrijving,
event:{input: $parent.fUpdateIJkpunt},
style: {color: disabled()? '#d9d9d9' : '#262626' }" ></textarea>
</td>
<td><textarea style="width:99%" data-bind="textInput:toelichting, event:{input: $parent.fUpdateIJkpunt}" ></textarea>
<td><textarea style="width:99%" data-bind="textInput:toelichting,
event:{input: $parent.fUpdateIJkpunt},
style: {color: disabled()? '#d9d9d9' : '#262626' }" ></textarea>
</td>
<td style="vertical-align: top">
<button class="delete noshow" data-bind="click: $parent.fDeleteIJkpunt, visible: indicatoren().length == 0"></button>
</td>
<td style="vertical-align: top" data-bind="click: $parent.fNieuweIndicator">
<button class="plus noshow"></button>
<td style="vertical-align: top" data-bind="click: $parent.fDisableIJkpunt">
<button class="fa fa-ban noshow" data-bind="style: {color: disabled() ? 'red' : 'black' }"></button>
</td>
<td style="vertical-align: top" data-bind="click: $parent.fNieuweIndicator ">
<button class=" noshow fa fa-plus " data-bind=" style: {color: disabled()? '#d9d9d9' : '#262626' }" ></button>
</td>
</tr>
<tr data-bind="visible: toonindics() && indicatoren().length > 0">
<td></td>
<td colspan=4>
<td colspan=5>
<table style="width: 100%">
<thead>
<tr>
<th class="header2" style="width4%;padding-left: 2px;text-align:center"> nr </th>
<!-- <th class="header2" style="width:7%;padding-left: 2px;text-align:center">insp.</th>-->
<!-- <th class="header2" style="width:7%;padding-left: 2px;text-align:center">insp.</th>-->
<th class="header2" style="width:6%;padding-left: 2px;text-align:center">w.</th>
<th class="header2" style="width:40%;padding-left: 2px"> schoolvorm</th>
<th class="header2" style="width:40%;padding-left: 2px"> ik-vorm</th>
@@ -96,19 +105,27 @@
<td style="vertical-align: top">
<input class= 'integer'
style="width: 100%"
data-bind="textInput: nummer, event:{input: $root.fUpdateIndicator}" /></td>
<!-- <td style="vertical-align: top">-->
<!-- <input style="width: 100%"-->
<!-- data-bind="textInput: inspectie, event:{input: $root.fUpdateIndicator}" /></td>-->
data-bind="textInput: nummer,
event:{input: $root.fUpdateIndicator},
style: {color: $parent.disabled()? '#d9d9d9' : '#262626' }" /></td>
<!-- <td style="vertical-align: top">-->
<!-- <input style="width: 100%"-->
<!-- data-bind="textInput: inspectie, event:{input: $root.fUpdateIndicator}" /></td>-->
<td style="vertical-align: top">
<input class= 'decimal'
style="width: 100%"
data-bind="textInput: gewicht, event:{input: $root.fUpdateIndicator}" /></td>
<td><textarea data-bind="textInput: omschrijving1, event:{input: $root.fUpdateIndicator}"
data-bind="textInput : gewicht,
event :{input: $root.fUpdateIndicator},
style : {color: $parent.disabled()? '#d9d9d9' : '#262626' }" /></td>
<td><textarea data-bind="textInput: omschrijving1,
event : {input: $root.fUpdateIndicator},
style : {color: $parent.disabled()? '#d9d9d9' : '#262626' }"
style="width:99%">
</textarea>
</td>
<td><textarea data-bind="textInput: omschrijving2, event:{input: $root.fUpdateIndicator}"
<td><textarea data-bind="textInput : omschrijving2,
event :{input: $root.fUpdateIndicator},
style : {color: $parent.disabled()? '#d9d9d9' : '#262626' }"
style="width: 99% ">
</textarea>
</td>
@@ -187,7 +204,7 @@
</div>
</div>
<!-- ************ pop nieuw indicator -->
<!-- ************ pop nieuw indicator -->
<div class="modal fade" id="modNieuwIndicator" role="dialog" >
<div class="modal-dialog modal-lg ">
<div class="modal-content">
@@ -205,10 +222,10 @@
<td style="width:20%"> gewicht</td>
<td > <input class="decimal" data-bind="textInput: gewicht" /></td>
</tr>
<!-- <tr >-->
<!-- <td style="width:20%">inspectie indicator (nummer)</td>-->
<!-- <td > <input data-bind="textInput: inspectie" /></td>-->
<!-- </tr>-->
<!-- <tr >-->
<!-- <td style="width:20%">inspectie indicator (nummer)</td>-->
<!-- <td > <input data-bind="textInput: inspectie" /></td>-->
<!-- </tr>-->
<tr>
<td style="width:20%">school omschrijving </td>
<td > <textarea style="width: 100%" data-bind="textInput: omschrijving1"></textarea></td>
public/js/monpas/models/monitormodel.js
+5 -2
View File
@@ -1,6 +1,6 @@
$(function(){
ls.initMonitorModel = function(){
ls.initMonitorModel = function(){
var timer;
function fAddOrgversion(p){
@@ -36,6 +36,8 @@ ls.initMonitorModel = function(){
this.nummer = p.nummer
this.omschrijving = p.omschrijving;
this.toelichting = p.toelichting;
this.disabled = ko.observable(false);
if(p.disabled == 'T')dit.disabled(true);
this.indicatorscores = ko.observableArray([]);
$.each(p.indicatorscores, function(j,k){
dit.indicatorscores.push(new fAddIndicatorscore(k));
@@ -209,6 +211,7 @@ ls.initMonitorModel = function(){
fUpdateScoretypeVanaf3: function(data){
var self= ls.MonitorModel
var indicatorscoreID = data;
console.log(this, "this")
var submitData = {
indicatorscoreid : indicatorscoreID,
@@ -273,5 +276,5 @@ ls.initMonitorModel = function(){
} ; // definition van model
ls.MonitorModel.initBindings();
}; // else
}// function initMonitorModel
}// function initMonitorModel
});
public/js/monpas/models/versiesmodel.js
+27 -2
View File
@@ -1,6 +1,6 @@
$(function(){
ls.initVersiesModel = function(){
ls.initVersiesModel = function(){
var timeout;
function fAddModule(p){
@@ -27,6 +27,8 @@ ls.initVersiesModel = function(){
});
}
this.toonindics = ko.observable(false);
this.disabled = ko.observable(false)
if(p.disabled == 'T') this.disabled(true);
}
function fAddIndicator(k){
this.id = k.id;
@@ -203,6 +205,7 @@ ls.initVersiesModel = function(){
else { apprise("Er is een fout opgetreden bij opslaan."); };
},'json');
},
fToggleIndicatoren: function(){
var self= ls.VersiesModel;
self.selectedIJkpunt(null);
@@ -212,6 +215,7 @@ ls.initVersiesModel = function(){
fUpdateIJkpunt: function(){
var self= ls.VersiesModel;
var dit = this;
if(dit.disabled()) return;
if (timeout){
clearTimeout(timeout)
timeout ==null;
@@ -227,6 +231,25 @@ ls.initVersiesModel = function(){
$.post("index.php/monpas/beheer/updateijkpunt",submitData, function(){})
},800);
},
fDisableIJkpunt: function(){
var self = ls.VersiesModel;
var dit = this;
dit.disabled(! dit.disabled())
var disabled = 'F';
if(dit.disabled()) disabled = 'T';
var submitData = {
'id' : dit.id,
'disabled' : disabled
}
$.post("index.php/monpas/beheer/disableijkpunt", submitData, function(){
});
},
fDeleteIJkpunt:function(){
var self =ls.VersiesModel;
var id = this.id;
@@ -248,6 +271,8 @@ ls.initVersiesModel = function(){
fNieuweIndicator: function(){
var self = ls.VersiesModel;
var num =0
var dit = this;
if(dit.disabled()) return;
self.selectedIJkpunt(this);
$.each(self.selectedIJkpunt().indicatoren(), function(j,k){
num=k.nummer();
@@ -311,5 +336,5 @@ ls.initVersiesModel = function(){
} ; // definition van model
ls.VersiesModel.initBindings();
}; // else
}// function initVersiesModel
}// function initVersiesModel
});