diff --git a/application/controllers/monpas/Beheer.php b/application/controllers/monpas/Beheer.php index ca66637..5cc8f81 100644 --- a/application/controllers/monpas/Beheer.php +++ b/application/controllers/monpas/Beheer.php @@ -20,6 +20,11 @@ class Beheer extends MY_Controller{ $modules = $this->Modules_model->getmodulesmetlijst(); echo json_encode($modules); } + + function getallmodules(){ + $modules = $this->Modules_model->getallmodulesmetcluster(); + echo json_encode($modules); + } function getversies(){ if (!$this->userid) die; $module=$this->uri->segment(4); diff --git a/application/models/monpas/Modules_model.php b/application/models/monpas/Modules_model.php index d189ce6..5139248 100644 --- a/application/models/monpas/Modules_model.php +++ b/application/models/monpas/Modules_model.php @@ -24,6 +24,25 @@ class Modules_model extends MY_Model{ ORDER BY volgorde"; return $this->get_query_result(); } + function getallmodulesmetcluster(){ + $this->sql =" SELECT M.id, M.sysnr, M.naam AS instrument, COALESCE(C.naam, 'geen') AS cluster, + COALESCE(C.naam, 'aaaa') AS ordening, instrument_type, + CASE WHEN SOP.id IS NULL THEN + 'F' + ELSE + 'T' + END AS insop, + SOP.sopnaam, SOP.blokjesnaam + + FROM tb_modules M + LEFT JOIN tb_cluster C ON M.cluster_id = C.id, + LEFT JOIN tb_compactsoponderdelen SOP on M.sysnr = SOP.module_nr + WHERE instrument_type <> 'GEENSOP' + ORDER BY ordening, instrument"; + return $this->get_query_result(); + } + + function getversietoegevoegdemodule($chapterid){ $this->sql =" SELECT * diff --git a/application/views/monpas/pages/instrumentencp.php b/application/views/monpas/pages/instrumentencp.php index bbb7b11..7d6c2f1 100644 --- a/application/views/monpas/pages/instrumentencp.php +++ b/application/views/monpas/pages/instrumentencp.php @@ -1,8 +1,37 @@ -