sciuro
/
jury_site
1
0
Fork 0
Code Issues 6 Releases Activity
Browse Source

Mogelijkheid editen van lijsten.

master
Rogier Neeleman 9 years ago
parent
32189c1004
commit
c1975f6c7e
6 changed files with 260 additions and 4 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 76
      application/controllers/Edit.php
  2. 12
      application/controllers/Uitslag.php
  3. 83
      application/models/Edit_model.php
  4. 10
      application/views/edit_lijst.php
  5. 81
      application/views/edit_score.php
  6. 2
      application/views/user_score.php

76
application/controllers/Edit.php
Unescape View File

@ -55,4 +55,80 @@ class Edit extends CI_Controller
redirect(base_url('edit/')); redirect(base_url('edit/'));
} }
public function lijst($lijstid, $ronde)
{
$data['page'] = 'edit';
$score = array();
// Get data
$this->load->model('Edit_model');
$subgroepen = $this->Edit_model->get_subgroepen();
$vragen = $this->Edit_model->get_vragen($lijstid);
$lijstnaam = $this->Edit_model->get_lijstnaam($lijstid);
foreach ($vragen as $vraag) {
$scorepv = $this->Edit_model->get_score($vraag['id'], $ronde);
foreach ($scorepv as $item) {
$score[$item['subgroepid']][$vraag['id']]['resultaatid'] = $item['id'];
$score[$item['subgroepid']][$vraag['id']]['score'] = $item['score'];
}
}
// Prepare data
$data['subgroepen'] = $subgroepen;
$data['vragen'] = $vragen;
$data['scores'] = $score;
$data['lijstid'] = $lijstid;
$data['lijstnaam'] = $lijstnaam;
$data['ronde'] = $ronde;
// Header
$this->load->view('header', $data);
// lijst list page
$this->load->view('edit_score', $data);
// Footer
$this->load->view('footer');
}
public function save()
{
if (!$this->input->post('save')) {
redirect(base_url('edit/'));
}
// Get data
$lijstid = $this->input->post('lijstid');
$this->load->model('Edit_model');
$subgroepen = $this->Edit_model->get_subgroepen();
$vragen = $this->Edit_model->get_vragen($lijstid);
$i=0;
foreach ($subgroepen as $subgroep) {
foreach ($vragen as $vraag) {
if (!empty($this->input->post($vraag['id'].'-'.$subgroep['id']))) {
$score=$this->input->post($vraag['id'].'-'.$subgroep['id']);
} else {
$score="0.00";
}
$store[$i] = array(
'regioid' => $this->session->regio,
'vraagid' => $vraag['id'],
'ronde' => $this->input->post('ronde'),
'subgroepid' => $subgroep['id'],
'timestamp' => date("Y-m-d H:i:s"),
'score' => $score,
'userid' => $this->session->id,
);
$i++;
}
}
$this->Edit_model->save_score($store);
redirect(base_url('edit/'));
}
} }

12
application/controllers/Uitslag.php
Unescape View File

@ -44,7 +44,10 @@ class Uitslag extends CI_Controller
$maxpunten[$max['spelgebiedid']]['naam'] = $max['naam']; $maxpunten[$max['spelgebiedid']]['naam'] = $max['naam'];
$maxpunten[$max['spelgebiedid']]['gewicht'] = $max['gewicht']; $maxpunten[$max['spelgebiedid']]['gewicht'] = $max['gewicht'];
} }
$uitslagr = array();
$uitslag = array();
foreach ($subgroepen as $subgroep) { foreach ($subgroepen as $subgroep) {
$data['uitslag'][$subgroep['id']]['total'] = 0; $data['uitslag'][$subgroep['id']]['total'] = 0;
$scores = $this->Uitslag_model->get_subgroep_punten($subgroep['id']); $scores = $this->Uitslag_model->get_subgroep_punten($subgroep['id']);
@ -69,6 +72,13 @@ class Uitslag extends CI_Controller
$uitslag[$key]['rang'] = $i; $uitslag[$key]['rang'] = $i;
$i++; $i++;
} }
foreach ($subgroepen as $subgroep) {
if (!isset($uitslag[$subgroep['id']]['rang'])) {
$uitslag[$subgroep['id']]['rang'] = 999;
$uitslag[$subgroep['id']] = 0;
}
}
// Prepare data // Prepare data
$data['subgroepen'] = $subgroepen; $data['subgroepen'] = $subgroepen;

83
application/models/Edit_model.php
Unescape View File

@ -14,7 +14,7 @@ class Edit_model extends CI_Model
public function get_lijst() public function get_lijst()
{ {
$this->db->select('id, naam, actief'); $this->db->select('id, naam, ronde, actief');
$this->db->from('lijst'); $this->db->from('lijst');
$this->db->where('jaar', date('Y')); $this->db->where('jaar', date('Y'));
$this->db->where('regioid', $this->session->regio); $this->db->where('regioid', $this->session->regio);
@ -25,6 +25,20 @@ class Edit_model extends CI_Model
return $query->result_array(); return $query->result_array();
} }
public function get_lijstnaam($id)
{
$this->db->select('naam');
$this->db->from('lijst');
$this->db->where('jaar', date('Y'));
$this->db->where('regioid', $this->session->regio);
$this->db->where('id', $id);
$this->db->order_by('naam', 'ASC');
$query = $this->db->get();
return $query->row()->naam;
}
public function change_lijst($id, $val) public function change_lijst($id, $val)
{ {
$data = array( $data = array(
@ -36,4 +50,71 @@ class Edit_model extends CI_Model
$this->db->update('lijst', $data); $this->db->update('lijst', $data);
} }
public function get_subgroepen()
{
$this->db->select('id, naam, themanaam');
$this->db->from('subgroep');
$this->db->where('subgroep.regioid', $this->session->regio);
$this->db->where('subgroep.jaar', date('Y'));
$query = $this->db->get();
return $query->result_array();
}
public function get_vragen($lijstid)
{
$this->db->select('vragen.id AS id, vraag, antwoord, score');
$this->db->from('vragen');
$this->db->where('vragen.regioid', $this->session->regio);
$this->db->where('vragen.jaar', date('Y'));
$this->db->where('lijst.id', $lijstid);
$this->db->join('lijst', 'vragen.lijstid=lijst.id', 'left');
$query = $this->db->get();
return $query->result_array();
}
public function get_score($vraagid, $ronde)
{
$this->db->select('id, subgroepid, score');
$this->db->from('resultaat');
$this->db->where('regioid', $this->session->regio);
$this->db->where('vraagid', $vraagid);
$this->db->where('ronde', $ronde);
$query = $this->db->get();
return $query->result_array();
}
public function save_score($data)
{
foreach ($data as $row) {
// Check for insert or update
$this->db->select('COUNT(*) AS aantal');
$this->db->from('resultaat');
$this->db->where('regioid', $this->session->regio);
$this->db->where('vraagid', $row['vraagid']);
$this->db->where('subgroepid', $row['subgroepid']);
$this->db->where('ronde', $row['ronde']);
$query = $this->db->get();
$rows = $query->row()->aantal;
if ($rows==1) {
$this->db->where('regioid', $this->session->regio);
$this->db->where('vraagid', $row['vraagid']);
$this->db->where('subgroepid', $row['subgroepid']);
$this->db->where('ronde', $row['ronde']);
$this->db->update('resultaat', $row);
} elseif ($rows==0) {
$this->db->insert('resultaat', $row);
} else {
echo "Duplicate result!";
}
}
}
} }

10
application/views/edit_lijst.php
Unescape View File

@ -2,6 +2,10 @@
<hr> <hr>
<div class="row"> <div class="row">
<div class="col-md-4 col-md-offset-4"> <div class="col-md-4 col-md-offset-4">
<p>
Met deze pagina kun je lijsten actief of inactief maken tbv. de beoordeling.
Tevens kunnen de ingevulde scores aangepast worden.
</p>
<table class="table table-hover" id="maintable"> <table class="table table-hover" id="maintable">
<thead> <thead>
<tr> <tr>
@ -14,7 +18,11 @@
<?php foreach ($lijsten as $lijst) {?> <?php foreach ($lijsten as $lijst) {?>
<tr> <tr>
<td><?php echo $lijst['naam']; ?></td> <td><?php echo $lijst['naam']; ?></td>
<td class="text-center"><a href="<?php echo base_url('edit/lijst/'.$lijst['id'])?>"><span class="glyphicon glyphicon-pencil"></span></a></td> <td class="text-center">
<?php for ($i=1; $i<=$lijst['ronde']; $i++) { ?>
<a href="<?php echo base_url('edit/lijst/'.$lijst['id'].'/'.$i)?>"><span class="glyphicon glyphicon-pencil"></span></a>
<?php } ?>
</td>
<?php if ($lijst['actief'] == 1) { ?> <?php if ($lijst['actief'] == 1) { ?>
<td class="text-center"><a href="<?php echo base_url('edit/disable/'.$lijst['id'])?>"><span class="glyphicon glyphicon-ok text-success"></span></a></td> <td class="text-center"><a href="<?php echo base_url('edit/disable/'.$lijst['id'])?>"><span class="glyphicon glyphicon-ok text-success"></span></a></td>
<?php } else { ?> <?php } else { ?>

81
application/views/edit_score.php
Unescape View File

@ -0,0 +1,81 @@
<div class="container">
<hr>
<div class="row">
<div class="col-md-12">
<h3>Lijst: <?php echo $lijstnaam; ?><br>Ronde: <?php echo $ronde; ?></h4>
<?php echo form_open(base_url().'edit/save'); ?>
<?php echo form_hidden('lijstid', $lijstid); ?>
<?php echo form_hidden('ronde', $ronde); ?>
<table class="table table-hover" id="maintable">
<thead>
<tr>
<th>Naam</th>
<?php foreach ($vragen as $vraag) { ?>
<th><?php echo $vraag['vraag']; ?></th>
<?php } ?>
</tr>
</thead>
<tbody>
<?php foreach ($subgroepen as $subgroep) {?>
<tr>
<td><?php echo $subgroep['themanaam']; ?></td>
<?php foreach ($vragen as $vraag) { ?>
<td>
<?php
if ($vraag['antwoord'] == 0) {
$checkbox = array(
'name' => $vraag['id'].'-'.$subgroep['id'],
'value' => $vraag['score']
);
if (isset($scores[$subgroep['id']][$vraag['id']]['score']) && $scores[$subgroep['id']][$vraag['id']]['score'] == $vraag['score']) {
$checkbox['checked'] = TRUE;
} else {
$checkbox['checked'] = FALSE;
}
echo form_checkbox($checkbox);
} elseif ($vraag['antwoord'] == 1) {
$dropdown = array();
for ($i=0; $i <= $vraag['score']; $i++) {
$dropdown[$i] = $i;
}
if (isset($scores[$subgroep['id']][$vraag['id']]['score'])) {
$select=$scores[$subgroep['id']][$vraag['id']]['score'];
} else {
$select=0;
}
echo form_dropdown($vraag['id'].'-'.$subgroep['id'], $dropdown, $select);
} elseif ($vraag['antwoord'] == 2) {
if (isset($scores[$subgroep['id']][$vraag['id']]['score'])) {
$select=$scores[$subgroep['id']][$vraag['id']]['score'];
} else {
$select="0.00";
}
$inputsetting = array(
'name' => $vraag['id'].'-'.$subgroep['id'],
'value' => $select,
'maxlength' => '4',
'size' => '4'
);
echo form_input($inputsetting);
}
?>
</td>
<?php } ?>
</tr>
<?php } ?>
</tbody>
</table>
<div class="text-right">
<button type="submit" class="btn btn-default" name="save" value="yes"><span class="glyphicon glyphicon-floppy-disk text-danger"></span></button>
</div>
<?php echo form_close(); ?>
</div>
</div
</div>

2
application/views/user_score.php
Unescape View File

@ -27,7 +27,7 @@
<?php if ($vraag['antwoord'] == 0) { <?php if ($vraag['antwoord'] == 0) {
echo ': '.form_checkbox($vraag['id'], '1'); echo ': '.form_checkbox($vraag['id'], '1');
} elseif ($vraag['antwoord'] == 1) { } elseif ($vraag['antwoord'] == 1) {
for ($i=1; $i <= $vraag['score']; $i++) { for ($i=0; $i <= $vraag['score']; $i++) {
$score[$i] = $i; $score[$i] = $i;
} }
echo form_dropdown($vraag['id'], $score); echo form_dropdown($vraag['id'], $score);

Write Preview
Loading…
Cancel
Save