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

flexibel sop

Browse Source
This commit is contained in:
Monique
2021-11-19 19:59:34 +01:00
parent b8177ade48
commit 39a120e214
14 changed files with 204 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/models/Phantom_model.php
+1
View File
@@ -55,6 +55,7 @@ class Phantom_model extends CI_Model{
if( $margins ) $data['margins'] = serialize($margins);
curl_setopt_array($curl, array(
curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, 0),
CURLOPT_RETURNTRANSFER => 1,
CURLOPT_URL => 'https://print.pensare-services.nl/test/1',
CURLOPT_POST => 1,
application/models/monpas/Sopinhouden_model.php
+37 -10
View File
@@ -571,7 +571,7 @@ class Sopinhouden_model extends MY_Model{
$laagstescore = 101;
if ($scores) {
foreach ($scores as $score) {
// $gem = 0;
$score->gem = round($score->gem);
//
// if ($score->num > 0) {
// $gem=$score->somscore / $score->num;
@@ -676,16 +676,33 @@ class Sopinhouden_model extends MY_Model{
$lks = $this->Filledversions_model->getlks($orgid, $orgversieid);
if ($lks){
foreach($lks as $lk){
$lk->scores = $this->Scores_model->getlkscores($lk->filledversionid);
$lk->scores = $this->Scores_model->calculateindividualscores($orgversieid, $orgid, $lk->user_id);
$som = 0;
if ($lk->scores){
foreach($lk->scores as $score){
foreach($lk->scores as $index => $score){
$aftrek = 0;
$score->gem = new stdClass();
$score->gem = $score->somcore / $score->num;
$score->colorcode = $this->kleurcodes->getkleur($score->gem);
$som = $som + $score->gem;
$score->gem = 0;
$score->colorcode = '#808080';
$score->disablenvt = 'F';
if($score->aantalvier > 0 && $score->aantalvier == $score->aantalnvt) $score->disablenvt = 'T';
if($score->disabled == 'F' && $score->disablenvt == 'F') {
$score->gem = $score->somscore / $score->num;
$score->colorcode = $this->kleurcodes->getkleur($score->gem);
$som = $som + $score->gem;
}
if($score->disabled == 'T') $aftrek++;
if($score->disablenvt == 'T') $aftrek++;
}
$lk->lkgem = round($som / $aantalijkpunten, 0);
$deler = $aantalijkpunten - $aftrek;
if ($deler > 0) $lk->lkgem = round($som / $aantalijkpunten, 0);
else $lk->gem = 0;
$lk->colorcode = $this->kleurcodes->getkleur($lk->lkgem);
}
}
@@ -704,11 +721,21 @@ class Sopinhouden_model extends MY_Model{
if ($lks[0]->scores){
$som = 0;
$aftrek = 0;
foreach($lks[0]->scores as $score){
$score->colorcode = $this->kleurcodes->getkleur($score->gem);
$som = $som + $score->gem;
$score->colorcode = '#808080';
if($score->disabled == 'F' && $score->disablenvt == 'F') {
$score->colorcode = $this->kleurcodes->getkleur($score->gem);
$som = $som + $score->gem;
}
if($score->disabled =='T' || $score->disablenvt =='T' ) $aftrek++;
}
$lks[0]->lkgem = round($som / $aantalijkpunten, 0);
if($aantalijkpunten - $aftrek > 0) {
$lks[0]->lkgem = round($som / ($aantalijkpunten - $aftrek), 0);
}
else{
$lks[0]->lkgem = 0;
}
$lks[0]->colorcode = $this->kleurcodes->getkleur($lks[0]->lkgem);
}
return $lks;
application/models/testPrint.http
+10
View File
@@ -0,0 +1,10 @@
### Send POST request with json body
POST https://print.pensare-services.nl/test/1
Content-Type: application/json
{
"html":"<h1>test</h1>",
"file":"test.png",
"app": "MONPAS"
}