WIP Gesamtnoteneingabe Notenberechnung endpoint

application/config/routes.php

@@ -62,6 +62,7 @@ $route['api/v1/ressource/[B|b]etriebsmittelperson/(:any)'] = 'api/v1/ressource/b
 $route['api/v1/system/[S|s]prache/(:any)'] = 'api/v1/system/sprache2/$1';
 
 $route['Cis/Stundenplan/.*'] = 'Cis/Stundenplan/index/$1';
+$route['Cis/Benotungstool/.*'] = 'Cis/Benotungstool/index/$1';
 
 // load routes from extensions
 $subdir = 'application/config/extensions';

application/controllers/Cis/Benotungstool.php

@@ -0,0 +1,36 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+/**
+ *
+ */
+class Benotungstool extends Auth_Controller
+{
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct([
+			'index' => self::PERM_LOGGED
+		]);
+	}
+
+	// -----------------------------------------------------------------------------------------------------------------
+	// Public methods
+
+	/**
+	 * @return void
+	 */
+	public function index()
+	{
+
+		$viewData = array(
+			'uid'=>getAuthUID(),
+		);
+
+		$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'Benotungstool']);
+	}
+	
+}

application/controllers/api/frontend/v1/Lehre.php

@@ -31,10 +31,15 @@ class Lehre extends FHCAPI_Controller
 			'lvStudentenMail' => self::PERM_LOGGED,
 			'LV' => self::PERM_LOGGED,
 			'Pruefungen' => self::PERM_LOGGED,
+			'getLvViewData' => self::PERM_LOGGED,
+			'getZugewieseneLv' => self::PERM_LOGGED
 		]);
 
+		// Loads phrases system
+		$this->loadPhrases([
+			'global'
+		]);
 		
-
 	}
 
 	//------------------------------------------------------------------------------------------------------------------
@@ -94,6 +99,36 @@ class Lehre extends FHCAPI_Controller
 
 		$this->terminateWithSuccess($result);
 	}
+
+	/**
+	 * fetches all assigned lehrveranstaltungen of a mitarbeiter for a given semester
+	 * @param mixed $uid
+	 * @param mixed $sem_kurzbz
+	 * @return void
+	 */
+	public function getZugewieseneLv() {
+		$uid = $this->input->get("uid",TRUE);
+		$sem_kurzbz = $this->input->get("sem_kurzbz",TRUE);
+
+		if(!isset($sem_kurzbz) || isEmptyString($sem_kurzbz))
+			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
+
+		if (!isset($uid) || isEmptyString($uid))
+			$uid = getAuthUID();
+
+		// querying other ma_uids data requires admin permission
+		if($uid !== getAuthUID()) {
+			$this->load->library('PermissionLib');
+			$isAdmin = $this->permissionlib->isBerechtigt('admin');
+			if(!$isAdmin) $this->terminateWithError($this->p->t('ui', 'keineBerechtigung'), 'general');
+		}
+
+		$this->load->model('education/Lehrveranstaltung_model', 'LehrveranstaltungModel');
+		$result = $this->LehrveranstaltungModel->getLvForLektorInSemester($sem_kurzbz, $uid);
+		$data = $this->getDataOrTerminateWithError($result);
+		$this->terminateWithSuccess($data);
+	}
+
 	
 
 	

application/controllers/api/frontend/v1/Noten.php

@@ -0,0 +1,94 @@
+<?php
+/**
+ * Copyright (C) 2024 fhcomplete.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+require_once(__DIR__.'/../../../../../include/lehreinheit.class.php');
+require_once(__DIR__.'/../../../../../include/legesamtnote.class.php');
+class Noten extends FHCAPI_Controller
+{
+
+	/**
+	 * Object initialization
+	 */
+	public function __construct()
+	{
+		parent::__construct([
+			'getStudentenNoten' => self::PERM_LOGGED, // todo: berechtigung
+			'getNoten' => self::PERM_LOGGED,
+			'saveStudentenNoten' => self::PERM_LOGGED // todo: berechtigungen!
+		]);
+
+		$this->load->library('AuthLib', null, 'AuthLib');
+		
+		// Loads phrases system
+		$this->loadPhrases([
+			'global'
+		]);
+
+	}
+
+	public function getStudentenNoten() {
+		$lv_id = $this->input->get("lv_id",TRUE);
+		$sem_kurzbz = $this->input->get("sem_kurzbz",TRUE);
+		$active = true; // todo: check this param
+
+		if (!isset($lv_id) || isEmptyString($lv_id)
+			|| !isset($sem_kurzbz) || isEmptyString($sem_kurzbz))
+			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
+
+		// todo: check various other berechtigungen if its mitarbeiter/lektor/zugeteilterLektor?
+
+		$this->load->model('education/Pruefung_model', 'PruefungModel');
+		$this->load->model('education/Lehrveranstaltung_model', 'LehrveranstaltungModel');
+
+		// get studenten for lva & sem with zeugnisnote if available
+		$studenten = $this->LehrveranstaltungModel->getStudentsByLv($sem_kurzbz, $lv_id, $active);
+		$studentenData = $this->getDataOrTerminateWithError($studenten);
+		
+		
+		
+		// get all prüfungen with noten held in that semester in that lva
+		$pruefungen = $this->PruefungModel->getPruefungenByLvStudiensemester($lv_id, $sem_kurzbz);
+		$pruefungenData = $this->getDataOrTerminateWithError($pruefungen);
+
+		$this->terminateWithSuccess(array($studentenData, $pruefungenData, DOMAIN));
+	}
+
+	public function getNoten() {
+		$this->load->model('education/Note_model', 'NoteModel');
+
+		$result = $this->NoteModel->getAll();
+		$noten = $this->getDataOrTerminateWithError($result);
+		$this->terminateWithSuccess($noten);
+	}
+	
+	public function saveStudentenNoten() {
+		$result = $this->getPostJSON();
+
+		if(!property_exists($result, 'password')) {
+			$this->terminateWithError($this->p->t('global', 'missingParameters'), 'general');
+		}
+
+		// TODO: send & save noten
+		
+		$this.$this->terminateWithSuccess($this->AuthLib->checkUserAuthByUsernamePassword(getAuthUID(), $result->password));
+	}
+
+}
+

application/controllers/api/frontend/v1/Studiensemester.php

@@ -0,0 +1,67 @@
+<?php
+/**
+ * Copyright (C) 2024 fhcomplete.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+class Studiensemester extends FHCAPI_Controller
+{
+
+	private $_ci;
+	
+	/**
+	 * Object initialization
+	 */
+	public function __construct()
+	{
+		parent::__construct([
+			'getStudiensemester'=> self::PERM_LOGGED,
+
+		]);
+
+		$this->_ci =& get_instance();
+		
+		$this->_ci->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
+		
+
+	}
+
+	//------------------------------------------------------------------------------------------------------------------
+	// Public methods
+
+	/**
+	 * GET METHOD
+	 * returns List of all studiensemester as well as current one
+	 */
+	public function getStudiensemester()
+	{
+		$this->_ci->StudiensemesterModel->addOrder("start", "DESC");
+		$result = $this->_ci->StudiensemesterModel->load();
+
+		$studiensemester = getData($result);
+		$result = $this->_ci->StudiensemesterModel->getAkt();
+		$aktuell = getData($result);
+
+		$this->terminateWithSuccess(array($studiensemester, $aktuell));
+	}
+
+	//------------------------------------------------------------------------------------------------------------------
+	// Private methods
+
+
+
+}
+

application/models/education/Lehrveranstaltung_model.php

@@ -988,4 +988,24 @@ class Lehrveranstaltung_model extends DB_Model
 
 		return $this->execQuery($qry, $params);
 	}
+
+	public function getLvForLektorInSemester($sem_kurzbz, $uid) {
+		$qry = "SELECT DISTINCT (tbl_lehrveranstaltung.lehrveranstaltung_id),
+				UPPER(tbl_studiengang.typ::varchar(1) || tbl_studiengang.kurzbz) as stg_kurzbz,
+				tbl_lehrveranstaltung.semester as lv_semester,
+				tbl_lehrveranstaltung.bezeichnung as lv_bezeichnung,
+				(SELECT kurzbz FROM public.tbl_mitarbeiter
+				 WHERE mitarbeiter_uid=tbl_lehreinheitmitarbeiter.mitarbeiter_uid) as lektor
+			FROM
+				lehre.tbl_lehreinheit JOIN lehre.tbl_lehreinheitmitarbeiter USING(lehreinheit_id)
+									  JOIN lehre.tbl_lehrveranstaltung USING(lehrveranstaltung_id)
+									  JOIN public.tbl_studiengang USING(studiengang_kz)
+									  JOIN lehre.tbl_lehrveranstaltung as lehrfach ON(tbl_lehreinheit.lehrfach_id=lehrfach.lehrveranstaltung_id)
+			WHERE
+				tbl_lehreinheit.studiensemester_kurzbz = ?
+			  AND mitarbeiter_uid = ?
+			ORDER BY stg_kurzbz,lv_semester,lv_bezeichnung";
+
+		return $this->execReadOnlyQuery($qry, array($sem_kurzbz, $uid));
+	}
 }

application/models/education/Note_model.php

@@ -11,4 +11,13 @@ class Note_model extends DB_Model
 		$this->dbTable = 'lehre.tbl_note';
 		$this->pk = 'note';
 	}
+	
+	public function getAll() {
+		$qry ="SELECT *
+			FROM lehre.tbl_note";
+		
+		return $this->execReadOnlyQuery($qry);
+	}
+	
+	
 }

application/models/education/Pruefung_model.php

@@ -306,4 +306,19 @@ class Pruefung_model extends DB_Model
 
 		return $this->loadWhereCommitteeExamsFailed();
 	}
+	
+	public function getPruefungenByLvStudiensemester($lv_id, $sem_kurzbz) {
+		$qry = "SELECT tbl_pruefung.*, tbl_lehrveranstaltung.bezeichnung as lehrveranstaltung_bezeichnung, tbl_lehrveranstaltung.lehrveranstaltung_id,
+				   tbl_note.bezeichnung as note_bezeichnung, tbl_pruefungstyp.beschreibung as typ_beschreibung, tbl_lehreinheit.studiensemester_kurzbz as studiensemester_kurzbz
+			FROM lehre.tbl_pruefung, lehre.tbl_lehreinheit, lehre.tbl_lehrveranstaltung, lehre.tbl_note, lehre.tbl_pruefungstyp
+			WHERE tbl_pruefung.lehreinheit_id=tbl_lehreinheit.lehreinheit_id
+			  AND tbl_lehreinheit.lehrveranstaltung_id=tbl_lehrveranstaltung.lehrveranstaltung_id
+			  AND tbl_pruefung.note = tbl_note.note
+			  AND tbl_pruefung.pruefungstyp_kurzbz=tbl_pruefungstyp.pruefungstyp_kurzbz
+			  AND tbl_lehrveranstaltung.lehrveranstaltung_id = ?
+			  AND tbl_lehreinheit.studiensemester_kurzbz = ?
+			ORDER BY datum DESC;";
+		
+		return $this->execReadOnlyQuery($qry, array($lv_id, $sem_kurzbz));
+	}
 }

application/views/CisRouterView/CisRouterView.php

@@ -23,7 +23,8 @@ $includesArray = array(
 	),
 	'customJSs' => array(
 		'vendor/npm-asset/primevue/accordion/accordion.js',
-		'vendor/npm-asset/primevue/accordiontab/accordiontab.js'
+		'vendor/npm-asset/primevue/accordiontab/accordiontab.js',
+		'vendor/npm-asset/primevue/password/password.js'
 	),
 	'customJSModules' => array(
 		'public/js/apps/Dashboard/Fhc.js'