From 2c43f85c8144d1827cdf658b2398554e27015a24 Mon Sep 17 00:00:00 2001 From: Monique Date: Tue, 27 Sep 2022 16:02:13 +0200 Subject: [PATCH] drag and drop gewenst bij Route --- .../controllers/monpas/Rapijkpunten.php | 7 +- .../controllers/monpas/Rapontwikkel.php | 6 + application/views/monpas/pages/ontwikkel.php | 111 ++++-------------- .../pages/partials/_draganddrop_agenda.php | 1 + .../monpas/pages/partials/_tabel_agenda.php | 1 + 5 files changed, 34 insertions(+), 92 deletions(-) create mode 100644 application/views/monpas/pages/partials/_draganddrop_agenda.php create mode 100644 application/views/monpas/pages/partials/_tabel_agenda.php diff --git a/application/controllers/monpas/Rapijkpunten.php b/application/controllers/monpas/Rapijkpunten.php index 38f9d6c..1dc0c86 100644 --- a/application/controllers/monpas/Rapijkpunten.php +++ b/application/controllers/monpas/Rapijkpunten.php @@ -85,9 +85,10 @@ class Rapijkpunten extends MY_Controller{ function checkLevel(){ if (!$this->userid) die; - $soort = $this->Organisaties_model->get_fieldvalue(array("id"=>$this->globorgid), 'soort' ); + $soort = $this->Organisaties_model->get_fieldvalue(array("id"=>$this->globorgid), 'soort' ); $werkter = $this->Orgusers_model->get_fieldvalue(array("user_id"=>$this->userid, "organisatie_id"=>$this->globorgid),"id"); - $level = 0; + + $level = 0; if ($soort < 4 && $werkter) { $level = 1; @@ -96,6 +97,8 @@ class Rapijkpunten extends MY_Controller{ echo json_encode($level); } + + function checkLevelInspectie(){ if (!$this->userid) die; $soort = $this->Organisaties_model->get_fieldvalue(array("id"=>$this->globorgid), 'soort' ); diff --git a/application/controllers/monpas/Rapontwikkel.php b/application/controllers/monpas/Rapontwikkel.php index 4735447..c9ef071 100644 --- a/application/controllers/monpas/Rapontwikkel.php +++ b/application/controllers/monpas/Rapontwikkel.php @@ -25,6 +25,12 @@ class Rapontwikkel extends MY_Controller { };// if } + function getModule(){ + $module = $this->session->userdata('module'); + + echo json_encode($module); + } + function savegewenst() { //TODO clean input diff --git a/application/views/monpas/pages/ontwikkel.php b/application/views/monpas/pages/ontwikkel.php index d1dc97e..910ce3b 100644 --- a/application/views/monpas/pages/ontwikkel.php +++ b/application/views/monpas/pages/ontwikkel.php @@ -170,7 +170,7 @@

@@ -183,102 +183,33 @@ value : selectedOrgversion, event : {change: fChangeVersion2}"> - + + +
+
toon drag and drop agenda
+
toon standaard agenda
+
+ + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
huidige situatie
 
gewenste situatie
 
- - - (Uitgezet.) - (Niet van toepassing.) -
- - - - -
-
+
+
+
+ load->view("monpas/pages/partials/_tabel_agenda"); ?>
-
-
-
-
-
- -
- -
- - -
+
+ load->view("monpas/pages/partials/_draganddrop_agenda"); ?> +
+
-
+ + + diff --git a/application/views/monpas/pages/partials/_draganddrop_agenda.php b/application/views/monpas/pages/partials/_draganddrop_agenda.php new file mode 100644 index 0000000..b3d9bbc --- /dev/null +++ b/application/views/monpas/pages/partials/_draganddrop_agenda.php @@ -0,0 +1 @@ +