Merge branch 'master' into feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter

application/controllers/jobs/AntragJob.php

@@ -349,6 +349,7 @@ class AntragJob extends JOB_Controller
 		$this->StudierendenantragModel->addSelect('prestudent_id');
 		$this->StudierendenantragModel->addSelect('studiensemester_kurzbz');
 		$this->StudierendenantragModel->addSelect('s.insertamum');
+		$this->StudierendenantragModel->addSelect('s.insertvon');
 
 		$this->StudierendenantragModel->db->where_in('public.get_rolle_prestudent(prestudent_id, studiensemester_kurzbz)', $this->config->item('antrag_prestudentstatus_whitelist'));
 
@@ -372,9 +373,11 @@ class AntragJob extends JOB_Controller
 				$result = $this->prestudentlib->setAbbrecher(
                     $antrag->prestudent_id,
                     $antrag->studiensemester_kurzbz,
-                    $insertvon,
+                    'AntragJob',
                     'abbrecherStgl',
-                    $antrag->insertamum
+                    $antrag->insertamum,
+                    null,
+                    $antrag->insertvon ?: $insertvon
                 );
 				if (isError($result))
 					$this->logError(getError($result));
@@ -413,7 +416,7 @@ class AntragJob extends JOB_Controller
 					}
 				}
 			}
-			$this->logInfo($count . " Students set to Abbrecher");
+			$this->logInfo($count . "/" . count($antraege) . " Students set to Abbrecher");
 		}
 		$this->logInfo('Ende Job handleAbmeldungenStglDeadline');
 	}

application/libraries/AntragLib.php

@@ -854,14 +854,18 @@ class AntragLib
 			$prestudent_status = current($res);
 			$email = $prestudent_status->email;
 			// NOTE(chris): Sancho mail
+			$lvzuweisungLink = site_url('lehre/Antrag/Wiederholung/assistenz/' . $antrag_id);
+			if( defined('VILESCI_ROOT') )
+			{
+				$lvzuweisungLink = VILESCI_ROOT . 'index.ci.php/lehre/Antrag/Wiederholung/assistenz/' . $antrag_id;
+			}
 			sendSanchoMail(
 				'Sancho_Mail_Antrag_W_New',
 				[
 					'antrag_id' => $antrag_id,
 					'stg' => $prestudent_status->stg_bezeichnung,
 					'Orgform' => $prestudent_status->orgform,
-					'lvzuweisungLink' => site_url('lehre/Antrag/Wiederholung/assistenz/' . $antrag_id),
-					'lvzuweisungLinkCIS' => CIS_ROOT . 'index.ci.php/lehre/Antrag/Wiederholung/assistenz/' . $antrag_id
+					'lvzuweisungLink' => $lvzuweisungLink 
 				],
 				$email,
 				$this->_ci->p->t('studierendenantrag', 'mail_subject_W_New')

application/libraries/PrestudentLib.php

@@ -35,10 +35,12 @@ class PrestudentLib
 		$this->_ci->load->model('organisation/Studiengang_model', 'StudiengangModel');
 	}
 
-	public function setAbbrecher($prestudent_id, $studiensemester_kurzbz, $insertvon = null, $statusgrund_kurzbz = null, $datum = null, $bestaetigtam = null)
+	public function setAbbrecher($prestudent_id, $studiensemester_kurzbz, $insertvon = null, $statusgrund_kurzbz = null, $datum = null, $bestaetigtam = null, $bestaetigtvon = null)
 	{
 		if (!$insertvon)
 			$insertvon = getAuthUID();
+		if (!$bestaetigtvon)
+			$bestaetigtvon = $insertvon;
 
 		$result = $this->_ci->PrestudentstatusModel->getLastStatus($prestudent_id, $studiensemester_kurzbz);
 		if (isError($result))
@@ -79,7 +81,7 @@ class PrestudentLib
 			'insertamum' => date('c'),
 			'orgform_kurzbz'=> $prestudent_status->orgform_kurzbz,
 			'studienplan_id'=> $prestudent_status->studienplan_id,
-			'bestaetigtvon' => $insertvon,
+			'bestaetigtvon' => $bestaetigtvon,
 			'bestaetigtam' => $bestaetigtam
 		]);
 

application/models/education/Pruefung_model.php

@@ -222,9 +222,9 @@ class Pruefung_model extends DB_Model
 		$this->withDetailsForStudierendenAntrag();
 
 		if ($maxDate)
-			$this->db->where("p.datum < ", $maxDate->format('c'));
+			$this->db->where("p.datum <= ", $maxDate->format('Y-m-d'));
 		if ($minDate)
-			$this->db->where("p.datum > ", $minDate->format('c'));
+			$this->db->where("p.datum > ", $minDate->format('Y-m-d'));
 
 		$this->db->where("b.aktiv", true);
 

application/views/lehre/Antrag/Create.php

@@ -35,13 +35,13 @@ $this->load->view(
 				antrag-type="<?= $antrag_type; ?>"
 				studierendenantrag-id="<?= $studierendenantrag_id; ?>"
 				v-model:info-array="infoArray"
-				v-model:status-msg="statusMsg"
-				v-model:status-severity="statusSeverity"
+				v-model:status-msg="status.msg"
+				v-model:status-severity="status.severity"
 				>
 			</studierendenantrag-antrag>
 		</div>
 		<div class="col-sm-4 mb-3">
-			<studierendenantrag-status :msg="statusMsg" :severity="statusSeverity"></studierendenantrag-status>
+			<studierendenantrag-status :msg="status.msg" :severity="status.severity"></studierendenantrag-status>
 			<studierendenantrag-infoblock :infos="infoArray"></studierendenantrag-infoblock>
 		</div>
 	</div>

application/views/lehre/Antrag/Student/List.php

@@ -82,7 +82,7 @@ $this->load->view(
 													<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
 												</div>
 												<div class="modal-body">
-													<pre><?= $antrag->grund; ?></pre>
+													<textarea class="form-control" style="width: 100%; height: 250px;" readonly><?= $antrag->grund; ?></textarea>
 												</div>
 											</div>
 										</div>