mirror of
https://github.com/FH-Complete/FHC-Core.git
synced 2026-07-25 08:34:29 +00:00
Merge branch 'master' into feature-13011/installation_on_multiple_servers
This commit is contained in:
Paolo
@@ -119,7 +119,7 @@ class requestAnrechnung extends Auth_Controller
|
|||||||
// Validate data
|
// Validate data
|
||||||
if (empty($_FILES['uploadfile']['name']))
|
if (empty($_FILES['uploadfile']['name']))
|
||||||
{
|
{
|
||||||
return $this->outputJsonError($this->p->t('ui', 'errorUploadFehlt'));
|
return $this->outputJsonError($this->p->t('ui', 'errorUploadFehltOderZuGross'));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (isEmptyString($begruendung_id) ||
|
if (isEmptyString($begruendung_id) ||
|
||||||
|
|||||||
@@ -560,7 +560,7 @@ class Prestudent_model extends DB_Model
|
|||||||
o.bezeichnung,
|
o.bezeichnung,
|
||||||
(CASE
|
(CASE
|
||||||
WHEN sg.typ = \'b\' THEN ps.prestudent_id
|
WHEN sg.typ = \'b\' THEN ps.prestudent_id
|
||||||
WHEN sg.typ = \'m\' THEN p.prestudent_id
|
WHEN sg.typ = \'m\' THEN ps.prestudent_id
|
||||||
ELSE NULL
|
ELSE NULL
|
||||||
END) AS prestudent_id
|
END) AS prestudent_id
|
||||||
FROM public.tbl_prestudent p
|
FROM public.tbl_prestudent p
|
||||||
@@ -581,7 +581,7 @@ class Prestudent_model extends DB_Model
|
|||||||
|
|
||||||
return $this->execQuery($query, array($person_id));
|
return $this->execQuery($query, array($person_id));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get latest ZGV Bezeichnung of Prestudent.
|
* Get latest ZGV Bezeichnung of Prestudent.
|
||||||
*
|
*
|
||||||
@@ -593,19 +593,19 @@ class Prestudent_model extends DB_Model
|
|||||||
{
|
{
|
||||||
show_error('Prestudent_id is not numeric.');
|
show_error('Prestudent_id is not numeric.');
|
||||||
}
|
}
|
||||||
|
|
||||||
$language_index = getUserLanguage() == 'German' ? 0 : 1;
|
$language_index = getUserLanguage() == 'German' ? 0 : 1;
|
||||||
|
|
||||||
$this->addSelect('
|
$this->addSelect('
|
||||||
COALESCE(
|
COALESCE(
|
||||||
array_to_json(zgvmaster.bezeichnung::varchar[])->>' . $language_index . ',
|
array_to_json(zgvmaster.bezeichnung::varchar[])->>' . $language_index . ',
|
||||||
array_to_json(zgv.bezeichnung::varchar[])->>' . $language_index . '
|
array_to_json(zgv.bezeichnung::varchar[])->>' . $language_index . '
|
||||||
) AS bezeichnung'
|
) AS bezeichnung'
|
||||||
);
|
);
|
||||||
|
|
||||||
$this->addJoin('bis.tbl_zgv zgv', 'zgv_code', 'LEFT');
|
$this->addJoin('bis.tbl_zgv zgv', 'zgv_code', 'LEFT');
|
||||||
$this->addJoin('bis.tbl_zgvmaster zgvmaster', 'zgvmas_code', 'LEFT');
|
$this->addJoin('bis.tbl_zgvmaster zgvmaster', 'zgvmas_code', 'LEFT');
|
||||||
|
|
||||||
return $this->loadWhere(array(
|
return $this->loadWhere(array(
|
||||||
'prestudent_id' => $prestudent_id
|
'prestudent_id' => $prestudent_id
|
||||||
));
|
));
|
||||||
@@ -618,8 +618,9 @@ class Prestudent_model extends DB_Model
|
|||||||
JOIN public.tbl_prestudent ps USING(prestudent_id)
|
JOIN public.tbl_prestudent ps USING(prestudent_id)
|
||||||
JOIN public.tbl_studiengang sg USING(studiengang_kz)
|
JOIN public.tbl_studiengang sg USING(studiengang_kz)
|
||||||
JOIN lehre.tbl_studienplan sp USING(studienplan_id)
|
JOIN lehre.tbl_studienplan sp USING(studienplan_id)
|
||||||
|
JOIN lehre.tbl_studienordnung so USING(studienordnung_id)
|
||||||
WHERE ps.person_id = ?
|
WHERE ps.person_id = ?
|
||||||
AND UPPER((sg.typ || sg.kurzbz) || ':' || sp.orgform_kurzbz) = ?
|
AND UPPER(so.studiengangkurzbzlang || ':' || sp.orgform_kurzbz) = ?
|
||||||
AND pss.studiensemester_kurzbz = ?
|
AND pss.studiensemester_kurzbz = ?
|
||||||
AND";
|
AND";
|
||||||
|
|
||||||
@@ -629,7 +630,7 @@ class Prestudent_model extends DB_Model
|
|||||||
$query .= " NOT EXISTS";
|
$query .= " NOT EXISTS";
|
||||||
|
|
||||||
$query .= " (SELECT 1 FROM public.tbl_prestudentstatus spss
|
$query .= " (SELECT 1 FROM public.tbl_prestudentstatus spss
|
||||||
JOIN public.tbl_prestudent sps USING(prestudent_id)
|
JOIN public.tbl_prestudent sps USING(prestudent_id)
|
||||||
WHERE sps.prestudent_id = ps.prestudent_id
|
WHERE sps.prestudent_id = ps.prestudent_id
|
||||||
AND spss.bewerbung_abgeschicktamum IS NOT NULL)";
|
AND spss.bewerbung_abgeschicktamum IS NOT NULL)";
|
||||||
|
|
||||||
|
|||||||
@@ -495,11 +495,12 @@ class Studiengang_model extends DB_Model
|
|||||||
|
|
||||||
public function getStudiengaengeWithOrgForm($typ, $semester)
|
public function getStudiengaengeWithOrgForm($typ, $semester)
|
||||||
{
|
{
|
||||||
$query = "SELECT DISTINCT (UPPER(sg.typ || sg.kurzbz || ':' || sp.orgform_kurzbz)) AS Studiengang
|
$query = "SELECT DISTINCT (UPPER(so.studiengangkurzbzlang || ':' || sp.orgform_kurzbz)) AS Studiengang
|
||||||
FROM public.tbl_studiengang sg
|
FROM public.tbl_studiengang sg
|
||||||
JOIN lehre.tbl_studienordnung USING (studiengang_kz)
|
JOIN lehre.tbl_studienordnung USING (studiengang_kz)
|
||||||
JOIN lehre.tbl_studienplan sp USING (studienordnung_id)
|
JOIN lehre.tbl_studienplan sp USING (studienordnung_id)
|
||||||
JOIN lehre.tbl_studienplan_semester spsem USING (studienplan_id)
|
JOIN lehre.tbl_studienplan_semester spsem USING (studienplan_id)
|
||||||
|
JOIN lehre.tbl_studienordnung so USING(studienordnung_id)
|
||||||
WHERE sp.aktiv = TRUE AND sg.aktiv = TRUE AND sg.typ IN ?
|
WHERE sp.aktiv = TRUE AND sg.aktiv = TRUE AND sg.typ IN ?
|
||||||
AND spsem.studiensemester_kurzbz = ?
|
AND spsem.studiensemester_kurzbz = ?
|
||||||
ORDER BY Studiengang";
|
ORDER BY Studiengang";
|
||||||
|
|||||||
@@ -26,7 +26,8 @@ $this->load->view(
|
|||||||
'neu',
|
'neu',
|
||||||
'maxZeichen',
|
'maxZeichen',
|
||||||
'errorBestaetigungFehlt',
|
'errorBestaetigungFehlt',
|
||||||
'systemfehler'
|
'systemfehler',
|
||||||
|
'errorDokumentZuGross'
|
||||||
),
|
),
|
||||||
'anrechnung' => array(
|
'anrechnung' => array(
|
||||||
'deadlineUeberschritten',
|
'deadlineUeberschritten',
|
||||||
@@ -179,7 +180,7 @@ $this->load->view(
|
|||||||
<div class="form-inline panel-body">
|
<div class="form-inline panel-body">
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<input type="file" id="requestAnrechnung-uploadfile"
|
<input type="file" id="requestAnrechnung-uploadfile"
|
||||||
name="uploadfile" accept=".pdf" size="50"
|
name="uploadfile" accept=".pdf" size="50" data-maxsize="<?php echo (int)ini_get('upload_max_filesize') * 1024 ?>"
|
||||||
required>
|
required>
|
||||||
</div>
|
</div>
|
||||||
<span id="requestAnrechnung-uploadTooltip" data-toggle="tooltip" data-placement="right"
|
<span id="requestAnrechnung-uploadTooltip" data-toggle="tooltip" data-placement="right"
|
||||||
|
|||||||
@@ -65,7 +65,7 @@
|
|||||||
if (!isset($formalReadonly)) :
|
if (!isset($formalReadonly)) :
|
||||||
?>
|
?>
|
||||||
<td>
|
<td>
|
||||||
<input type="checkbox" class="form-check-input prchbox"
|
<input type="checkbox" class="form-check-input prchbox" autocomplete="off"
|
||||||
id="prchkbx_<?php echo $dokument->akte_id ?>" <?php echo $geprueft ?>>
|
id="prchkbx_<?php echo $dokument->akte_id ?>" <?php echo $geprueft ?>>
|
||||||
<span id="formalgeprueftam_<?php echo $dokument->akte_id ?>">
|
<span id="formalgeprueftam_<?php echo $dokument->akte_id ?>">
|
||||||
<?php echo isset($dokument->formal_geprueft_amum) ? date_format(date_create($dokument->formal_geprueft_amum), 'd.m.Y') : ''; ?>
|
<?php echo isset($dokument->formal_geprueft_amum) ? date_format(date_create($dokument->formal_geprueft_amum), 'd.m.Y') : ''; ?>
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ $query = '
|
|||||||
ps.prestudent_id AS "PreStudentID",
|
ps.prestudent_id AS "PreStudentID",
|
||||||
p.vorname AS "Vorname",
|
p.vorname AS "Vorname",
|
||||||
p.nachname AS "Nachname",
|
p.nachname AS "Nachname",
|
||||||
sg.kurzbzlang as "Studiengang",
|
so.studiengangkurzbzlang as "Studiengang",
|
||||||
pss.insertamum AS "AbgewiesenAm",
|
pss.insertamum AS "AbgewiesenAm",
|
||||||
(
|
(
|
||||||
SELECT l.zeitpunkt
|
SELECT l.zeitpunkt
|
||||||
@@ -43,6 +43,8 @@ $query = '
|
|||||||
JOIN public.tbl_prestudent ps USING(prestudent_id)
|
JOIN public.tbl_prestudent ps USING(prestudent_id)
|
||||||
JOIN public.tbl_person p USING(person_id)
|
JOIN public.tbl_person p USING(person_id)
|
||||||
JOIN public.tbl_studiengang sg USING(studiengang_kz)
|
JOIN public.tbl_studiengang sg USING(studiengang_kz)
|
||||||
|
JOIN lehre.tbl_studienplan sp USING(studienplan_id)
|
||||||
|
JOIN lehre.tbl_studienordnung so USING(studienordnung_id)
|
||||||
WHERE pss.status_kurzbz = '. $ABGEWIESENEN_STATUS .'
|
WHERE pss.status_kurzbz = '. $ABGEWIESENEN_STATUS .'
|
||||||
AND pss.studiensemester_kurzbz = '. $STUDIENSEMESTER .'
|
AND pss.studiensemester_kurzbz = '. $STUDIENSEMESTER .'
|
||||||
AND (sg.typ IN ('. $STUDIENGANG_TYP .')
|
AND (sg.typ IN ('. $STUDIENGANG_TYP .')
|
||||||
|
|||||||
@@ -137,11 +137,12 @@
|
|||||||
LIMIT 1
|
LIMIT 1
|
||||||
) AS "AnzahlAbgeschickt",
|
) AS "AnzahlAbgeschickt",
|
||||||
(
|
(
|
||||||
SELECT ARRAY_TO_STRING(ARRAY_AGG(DISTINCT UPPER(sg.typ || sg.kurzbz) || \':\' || sp.orgform_kurzbz), \', \')
|
SELECT ARRAY_TO_STRING(ARRAY_AGG(DISTINCT UPPER(so.studiengangkurzbzlang) || \':\' || sp.orgform_kurzbz), \', \')
|
||||||
FROM public.tbl_prestudentstatus pss
|
FROM public.tbl_prestudentstatus pss
|
||||||
JOIN public.tbl_prestudent ps USING(prestudent_id)
|
JOIN public.tbl_prestudent ps USING(prestudent_id)
|
||||||
JOIN public.tbl_studiengang sg USING(studiengang_kz)
|
JOIN public.tbl_studiengang sg USING(studiengang_kz)
|
||||||
JOIN lehre.tbl_studienplan sp USING(studienplan_id)
|
JOIN lehre.tbl_studienplan sp USING(studienplan_id)
|
||||||
|
JOIN lehre.tbl_studienordnung so USING(studienordnung_id)
|
||||||
WHERE pss.status_kurzbz = '.$INTERESSENT_STATUS.'
|
WHERE pss.status_kurzbz = '.$INTERESSENT_STATUS.'
|
||||||
AND pss.bewerbung_abgeschicktamum IS NOT NULL
|
AND pss.bewerbung_abgeschicktamum IS NOT NULL
|
||||||
-- AND pss.bestaetigtam IS NULL
|
-- AND pss.bestaetigtam IS NULL
|
||||||
@@ -162,11 +163,12 @@
|
|||||||
LIMIT 1
|
LIMIT 1
|
||||||
) AS "StgAbgeschickt",
|
) AS "StgAbgeschickt",
|
||||||
(
|
(
|
||||||
SELECT ARRAY_TO_STRING(ARRAY_AGG(DISTINCT UPPER(sg.typ || sg.kurzbz) || \':\' || sp.orgform_kurzbz), \', \')
|
SELECT ARRAY_TO_STRING(ARRAY_AGG(DISTINCT UPPER(so.studiengangkurzbzlang) || \':\' || sp.orgform_kurzbz), \', \')
|
||||||
FROM public.tbl_prestudentstatus pss
|
FROM public.tbl_prestudentstatus pss
|
||||||
JOIN public.tbl_prestudent ps USING(prestudent_id)
|
JOIN public.tbl_prestudent ps USING(prestudent_id)
|
||||||
JOIN public.tbl_studiengang sg USING(studiengang_kz)
|
JOIN public.tbl_studiengang sg USING(studiengang_kz)
|
||||||
JOIN lehre.tbl_studienplan sp USING(studienplan_id)
|
JOIN lehre.tbl_studienplan sp USING(studienplan_id)
|
||||||
|
JOIN lehre.tbl_studienordnung so USING(studienordnung_id)
|
||||||
WHERE pss.status_kurzbz = '.$INTERESSENT_STATUS.'
|
WHERE pss.status_kurzbz = '.$INTERESSENT_STATUS.'
|
||||||
AND pss.bewerbung_abgeschicktamum IS NULL
|
AND pss.bewerbung_abgeschicktamum IS NULL
|
||||||
AND pss.bestaetigtam IS NULL
|
AND pss.bestaetigtam IS NULL
|
||||||
@@ -214,11 +216,12 @@
|
|||||||
LIMIT 1
|
LIMIT 1
|
||||||
) AS "AnzahlStgNichtAbgeschickt",
|
) AS "AnzahlStgNichtAbgeschickt",
|
||||||
(
|
(
|
||||||
SELECT ARRAY_TO_STRING(ARRAY_AGG(DISTINCT UPPER(sg.typ || sg.kurzbz) || \':\' || sp.orgform_kurzbz), \', \')
|
SELECT ARRAY_TO_STRING(ARRAY_AGG(DISTINCT UPPER(so.studiengangkurzbzlang) || \':\' || sp.orgform_kurzbz), \', \')
|
||||||
FROM public.tbl_prestudentstatus pss
|
FROM public.tbl_prestudentstatus pss
|
||||||
JOIN public.tbl_prestudent ps USING(prestudent_id)
|
JOIN public.tbl_prestudent ps USING(prestudent_id)
|
||||||
JOIN public.tbl_studiengang sg USING(studiengang_kz)
|
JOIN public.tbl_studiengang sg USING(studiengang_kz)
|
||||||
JOIN lehre.tbl_studienplan sp USING(studienplan_id)
|
JOIN lehre.tbl_studienplan sp USING(studienplan_id)
|
||||||
|
JOIN lehre.tbl_studienordnung so USING(studienordnung_id)
|
||||||
WHERE pss.status_kurzbz IN ('.$STATUS_KURZBZ.')
|
WHERE pss.status_kurzbz IN ('.$STATUS_KURZBZ.')
|
||||||
AND pss.bewerbung_abgeschicktamum IS NULL
|
AND pss.bewerbung_abgeschicktamum IS NULL
|
||||||
AND ps.person_id = p.person_id
|
AND ps.person_id = p.person_id
|
||||||
|
|||||||
@@ -106,11 +106,12 @@ $query = '
|
|||||||
LIMIT 1
|
LIMIT 1
|
||||||
) AS "AnzahlAbgeschickt",
|
) AS "AnzahlAbgeschickt",
|
||||||
(
|
(
|
||||||
SELECT ARRAY_TO_STRING(ARRAY_AGG(DISTINCT UPPER(sg.typ || sg.kurzbz || \':\' || sp.orgform_kurzbz)), \', \')
|
SELECT ARRAY_TO_STRING(ARRAY_AGG(DISTINCT UPPER(so.studiengangkurzbzlang) || \':\' || sp.orgform_kurzbz), \', \')
|
||||||
FROM public.tbl_prestudentstatus pss
|
FROM public.tbl_prestudentstatus pss
|
||||||
JOIN public.tbl_prestudent ps USING(prestudent_id)
|
JOIN public.tbl_prestudent ps USING(prestudent_id)
|
||||||
JOIN public.tbl_studiengang sg USING(studiengang_kz)
|
JOIN public.tbl_studiengang sg USING(studiengang_kz)
|
||||||
JOIN lehre.tbl_studienplan sp USING(studienplan_id)
|
JOIN lehre.tbl_studienplan sp USING(studienplan_id)
|
||||||
|
JOIN lehre.tbl_studienordnung so USING(studienordnung_id)
|
||||||
WHERE pss.status_kurzbz = '.$INTERESSENT_STATUS.'
|
WHERE pss.status_kurzbz = '.$INTERESSENT_STATUS.'
|
||||||
AND pss.bewerbung_abgeschicktamum IS NOT NULL
|
AND pss.bewerbung_abgeschicktamum IS NOT NULL
|
||||||
AND ps.person_id = p.person_id
|
AND ps.person_id = p.person_id
|
||||||
@@ -128,11 +129,12 @@ $query = '
|
|||||||
LIMIT 1
|
LIMIT 1
|
||||||
) AS "StgAbgeschickt",
|
) AS "StgAbgeschickt",
|
||||||
(
|
(
|
||||||
SELECT ARRAY_TO_STRING(ARRAY_AGG(DISTINCT UPPER(sg.typ || sg.kurzbz) || \':\' || sp.orgform_kurzbz), \', \')
|
SELECT ARRAY_TO_STRING(ARRAY_AGG(DISTINCT UPPER(so.studiengangkurzbzlang) || \':\' || sp.orgform_kurzbz), \', \')
|
||||||
FROM public.tbl_prestudentstatus pss
|
FROM public.tbl_prestudentstatus pss
|
||||||
JOIN public.tbl_prestudent ps USING(prestudent_id)
|
JOIN public.tbl_prestudent ps USING(prestudent_id)
|
||||||
JOIN public.tbl_studiengang sg USING(studiengang_kz)
|
JOIN public.tbl_studiengang sg USING(studiengang_kz)
|
||||||
JOIN lehre.tbl_studienplan sp USING(studienplan_id)
|
JOIN lehre.tbl_studienplan sp USING(studienplan_id)
|
||||||
|
JOIN lehre.tbl_studienordnung so USING(studienordnung_id)
|
||||||
WHERE pss.status_kurzbz IN ('.$STATUS_KURZBZ.')
|
WHERE pss.status_kurzbz IN ('.$STATUS_KURZBZ.')
|
||||||
|
|
||||||
AND ps.person_id = p.person_id
|
AND ps.person_id = p.person_id
|
||||||
|
|||||||
@@ -85,11 +85,12 @@ $query = '
|
|||||||
LIMIT 1
|
LIMIT 1
|
||||||
) AS "AnzahlAbgeschickt",
|
) AS "AnzahlAbgeschickt",
|
||||||
(
|
(
|
||||||
SELECT ARRAY_TO_STRING(ARRAY_AGG(DISTINCT UPPER(sg.typ || sg.kurzbz || \':\' || sp.orgform_kurzbz)), \', \')
|
SELECT ARRAY_TO_STRING(ARRAY_AGG(DISTINCT UPPER(so.studiengangkurzbzlang) || \':\' || sp.orgform_kurzbz), \', \')
|
||||||
FROM public.tbl_prestudentstatus pss
|
FROM public.tbl_prestudentstatus pss
|
||||||
JOIN public.tbl_prestudent ps USING(prestudent_id)
|
JOIN public.tbl_prestudent ps USING(prestudent_id)
|
||||||
JOIN public.tbl_studiengang sg USING(studiengang_kz)
|
JOIN public.tbl_studiengang sg USING(studiengang_kz)
|
||||||
JOIN lehre.tbl_studienplan sp USING(studienplan_id)
|
JOIN lehre.tbl_studienplan sp USING(studienplan_id)
|
||||||
|
JOIN lehre.tbl_studienordnung so USING(studienordnung_id)
|
||||||
WHERE pss.status_kurzbz = '.$INTERESSENT_STATUS.'
|
WHERE pss.status_kurzbz = '.$INTERESSENT_STATUS.'
|
||||||
AND pss.bewerbung_abgeschicktamum IS NOT NULL
|
AND pss.bewerbung_abgeschicktamum IS NOT NULL
|
||||||
AND ps.person_id = p.person_id
|
AND ps.person_id = p.person_id
|
||||||
|
|||||||
@@ -224,8 +224,9 @@ if ($result = $db->db_query($qry)) {
|
|||||||
else
|
else
|
||||||
$zusatz = '';
|
$zusatz = '';
|
||||||
|
|
||||||
if ($row->bisio_id != '' && $row->status != 'Incoming' && ($row->bis > $stsemdatumvon || $row->bis == '') && $row->von < $stsemdatumbis) //Outgoing
|
if ($row->bisio_id != '' && $row->status != 'Incoming' && ($row->bis > $stsemdatumvon || $row->bis == '') && $row->von < $stsemdatumbis
|
||||||
$zusatz .= '(o)(ab ' . $datum->formatDatum($row->von, 'd.m.Y') . ')';
|
&& (anzahlTage($row->von, $row->bis) >= 30)) //Outgoing
|
||||||
|
$zusatz .= '(o)(ab '. $datum->formatDatum($row->von, 'd.m.Y'). ')';
|
||||||
|
|
||||||
if ($row->note == 6) //angerechnet
|
if ($row->note == 6) //angerechnet
|
||||||
$zusatz .= '(ar)';
|
$zusatz .= '(ar)';
|
||||||
|
|||||||
@@ -38,6 +38,8 @@ require_once('../../../include/phrasen.class.php');
|
|||||||
|
|
||||||
$uid = get_uid();
|
$uid = get_uid();
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
$sprache = getSprache();
|
$sprache = getSprache();
|
||||||
$p = new phrasen($sprache);
|
$p = new phrasen($sprache);
|
||||||
|
|
||||||
@@ -112,6 +114,12 @@ else
|
|||||||
$format_highlight->setBorder(1);
|
$format_highlight->setBorder(1);
|
||||||
$format_highlight->setBorderColor('white');
|
$format_highlight->setBorderColor('white');
|
||||||
|
|
||||||
|
$format_highlightright=& $workbook->addFormat();
|
||||||
|
$format_highlightright->setFgColor(15);
|
||||||
|
$format_highlightright->setBorder(1);
|
||||||
|
$format_highlightright->setBorderColor('white');
|
||||||
|
$format_highlightright->setAlign('right');
|
||||||
|
|
||||||
$format_border_bottom =& $workbook->addFormat();
|
$format_border_bottom =& $workbook->addFormat();
|
||||||
$format_border_bottom ->setBottom(2);
|
$format_border_bottom ->setBottom(2);
|
||||||
$format_border_bottom->setBold();
|
$format_border_bottom->setBold();
|
||||||
@@ -200,27 +208,32 @@ else
|
|||||||
$stsemdatumvon = $stsem_obj->start;
|
$stsemdatumvon = $stsem_obj->start;
|
||||||
$stsemdatumbis = $stsem_obj->ende;
|
$stsemdatumbis = $stsem_obj->ende;
|
||||||
|
|
||||||
$qry = "SELECT
|
$qry = "
|
||||||
distinct on(nachname, vorname, person_id) vorname, nachname, matrikelnr, person_id, tbl_student.student_uid as uid,
|
SELECT
|
||||||
tbl_studentlehrverband.semester, tbl_studentlehrverband.verband, tbl_studentlehrverband.gruppe,
|
distinct on(nachname, vorname, person_id)
|
||||||
(SELECT status_kurzbz
|
vorname, nachname, matrikelnr, person_id, tbl_student.student_uid as uid,
|
||||||
FROM public.tbl_prestudentstatus
|
tbl_studentlehrverband.semester, tbl_studentlehrverband.verband, tbl_studentlehrverband.gruppe,
|
||||||
WHERE prestudent_id=tbl_student.prestudent_id
|
(SELECT status_kurzbz
|
||||||
ORDER BY datum DESC, insertamum DESC, ext_id DESC LIMIT 1) as status,
|
FROM public.tbl_prestudentstatus
|
||||||
tbl_bisio.bisio_id, tbl_bisio.bis, tbl_bisio.von,
|
WHERE prestudent_id=tbl_student.prestudent_id
|
||||||
tbl_zeugnisnote.note,tbl_mobilitaet.mobilitaetstyp_kurzbz,
|
ORDER BY datum DESC, insertamum DESC, ext_id DESC LIMIT 1) as status,
|
||||||
(CASE WHEN bis.tbl_mobilitaet.studiensemester_kurzbz = vw_student_lehrveranstaltung.studiensemester_kurzbz THEN '1' ELSE '' END) as doubledegree
|
tbl_bisio.bisio_id, tbl_bisio.bis, tbl_bisio.von,
|
||||||
FROM campus.vw_student_lehrveranstaltung JOIN public.tbl_benutzer USING(uid)
|
tbl_zeugnisnote.note,tbl_mobilitaet.mobilitaetstyp_kurzbz,
|
||||||
JOIN public.tbl_person USING(person_id) JOIN public.tbl_student ON(uid=student_uid)
|
(CASE WHEN bis.tbl_mobilitaet.studiensemester_kurzbz = vw_student_lehrveranstaltung.studiensemester_kurzbz THEN '1' ELSE '' END) as doubledegree,
|
||||||
LEFT JOIN public.tbl_studentlehrverband USING(student_uid,studiensemester_kurzbz)
|
tbl_note.lkt_ueberschreibbar, tbl_note.anmerkung
|
||||||
LEFT JOIN lehre.tbl_zeugnisnote on(vw_student_lehrveranstaltung.lehrveranstaltung_id=tbl_zeugnisnote.lehrveranstaltung_id
|
FROM
|
||||||
AND tbl_zeugnisnote.student_uid=tbl_student.student_uid
|
campus.vw_student_lehrveranstaltung JOIN public.tbl_benutzer USING(uid)
|
||||||
AND tbl_zeugnisnote.studiensemester_kurzbz=tbl_studentlehrverband.studiensemester_kurzbz)
|
JOIN public.tbl_person USING(person_id) JOIN public.tbl_student ON(uid=student_uid)
|
||||||
LEFT JOIN bis.tbl_bisio ON(uid=tbl_bisio.student_uid)
|
LEFT JOIN public.tbl_studentlehrverband USING(student_uid,studiensemester_kurzbz)
|
||||||
LEFT JOIN bis.tbl_mobilitaet USING(prestudent_id)
|
LEFT JOIN lehre.tbl_zeugnisnote on(vw_student_lehrveranstaltung.lehrveranstaltung_id=tbl_zeugnisnote.lehrveranstaltung_id
|
||||||
|
AND tbl_zeugnisnote.student_uid=tbl_student.student_uid
|
||||||
|
AND tbl_zeugnisnote.studiensemester_kurzbz=tbl_studentlehrverband.studiensemester_kurzbz)
|
||||||
|
LEFT JOIN bis.tbl_bisio ON(uid=tbl_bisio.student_uid)
|
||||||
|
LEFT JOIN bis.tbl_mobilitaet USING(prestudent_id)
|
||||||
|
LEFT JOIN lehre.tbl_note USING(note)
|
||||||
WHERE
|
WHERE
|
||||||
vw_student_lehrveranstaltung.lehrveranstaltung_id=".$db->db_add_param($lvid, FHC_INTEGER)." AND
|
vw_student_lehrveranstaltung.lehrveranstaltung_id=".$db->db_add_param($lvid, FHC_INTEGER)."
|
||||||
vw_student_lehrveranstaltung.studiensemester_kurzbz=".$db->db_add_param($stsem);";";
|
AND vw_student_lehrveranstaltung.studiensemester_kurzbz=".$db->db_add_param($stsem);";";
|
||||||
|
|
||||||
if($lehreinheit_id!='')
|
if($lehreinheit_id!='')
|
||||||
$qry.=" AND vw_student_lehrveranstaltung.lehreinheit_id=".$db->db_add_param($lehreinheit_id, FHC_INTEGER);
|
$qry.=" AND vw_student_lehrveranstaltung.lehreinheit_id=".$db->db_add_param($lehreinheit_id, FHC_INTEGER);
|
||||||
@@ -243,18 +256,22 @@ else
|
|||||||
$inc=' (i)';
|
$inc=' (i)';
|
||||||
else
|
else
|
||||||
$inc='';
|
$inc='';
|
||||||
if($elem->bisio_id!='' && $elem->status!='Incoming' && ($elem->bis > $stsemdatumvon || $elem->bis=='') && $elem->von < $stsemdatumbis) //Outgoing
|
|
||||||
$inc.=' (o)';
|
|
||||||
|
|
||||||
if($elem->note==6) //angerechnet
|
if($elem->bisio_id != '' && $elem->status != 'Incoming' && ($elem->bis > $stsemdatumvon || $elem->bis == '')
|
||||||
|
&& $elem->von < $stsemdatumbis && (anzahlTage($elem->von, $elem->bis) >= 30))
|
||||||
|
$inc.=' (o)';
|
||||||
|
|
||||||
|
$note = $elem->note;
|
||||||
|
|
||||||
|
if($elem->lkt_ueberschreibbar == 'f') // angerechnet / intern angerechnet / nicht zugelassen
|
||||||
{
|
{
|
||||||
$inc.=' (ar)';
|
$inc.= '('. $elem->anmerkung. ')';
|
||||||
$note='ar';
|
$note = $elem->anmerkung;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($elem->mobilitaetstyp_kurzbz !='' && $elem->doubledegree == 1) //dd-Program
|
if ($elem->mobilitaetstyp_kurzbz !='' && $elem->doubledegree == 1) //dd-Program
|
||||||
{
|
{
|
||||||
$inc.=' (d.d.)';
|
$inc .=' (d.d.)';
|
||||||
}
|
}
|
||||||
|
|
||||||
$worksheet->write($lines,1,$elem->uid);
|
$worksheet->write($lines,1,$elem->uid);
|
||||||
@@ -262,7 +279,7 @@ else
|
|||||||
$worksheet->write($lines,3,$elem->vorname);
|
$worksheet->write($lines,3,$elem->vorname);
|
||||||
$worksheet->write($lines,4,'="'.$elem->semester.$elem->verband.$elem->gruppe.'"');
|
$worksheet->write($lines,4,'="'.$elem->semester.$elem->verband.$elem->gruppe.'"');
|
||||||
$worksheet->write($lines,5,'="'.trim($elem->matrikelnr).'"',$format_highlight);
|
$worksheet->write($lines,5,'="'.trim($elem->matrikelnr).'"',$format_highlight);
|
||||||
$worksheet->write($lines,6,$note,$format_highlight);
|
$worksheet->write($lines,6, $note, $format_highlightright);
|
||||||
$i++;
|
$i++;
|
||||||
$lines++;
|
$lines++;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -266,14 +266,14 @@ function showHideBezeichnungDropDown()
|
|||||||
if (dd.options[dd.selectedIndex].value == 'DienstV')
|
if (dd.options[dd.selectedIndex].value == 'DienstV')
|
||||||
{
|
{
|
||||||
var str = '<select name="bezeichnung" class="dd_breit">';
|
var str = '<select name="bezeichnung" class="dd_breit">';
|
||||||
str += '<option value="Eheschließung">a) Eigene Eheschließung</option>';
|
str += '<option value="Eheschließung">a) Eigene Eheschließung (3 Tage)</option>';
|
||||||
str += '<option value="Geburt eigenes Kind">b) Geburt eines Kindes der Ehefrau/Lebensgefährtin</option>';
|
str += '<option value="Geburt eigenes Kind">b) Geburt eines Kindes der Ehefrau/Lebensgefährtin (2 Tage)</option>';
|
||||||
str += '<option value="Heirat Kind/Geschwister">c) Eheschließung eines Kindes/eigener Geschwister</option>';
|
str += '<option value="Heirat Kind/Geschwister">c) Eheschließung eines Kindes/eigener Geschwister (1 Tag)</option>';
|
||||||
str += '<option value="Eigene Sponsion/Promotion">d) Teilnahme an eigener Sponsion/Promotion</option>';
|
str += '<option value="Eigene Sponsion/Promotion">d) Teilnahme an eigener Sponsion/Promotion (1 Tag)</option>';
|
||||||
str += '<option value="Lebensbedr. Erkrankung P/K/E">e) Lebensbedrohliche Erkrankung Partner/Kinder/Eltern</option>';
|
str += '<option value="Lebensbedr. Erkrankung P/K/E">e) Lebensbedrohliche Erkrankung Partner/Kinder/Eltern (3 Tage)</option>';
|
||||||
str += '<option value="Ableben P/K/E">f) Ableben Partner/Kinder/Elternteil</option>';
|
str += '<option value="Ableben P/K/E">f) Ableben Partner/Kinder/Elternteil (3 Tage)</option>';
|
||||||
str += '<option value="Bestattung G/S/G">g) Teilnahme an Bestattung Geschwister/Schwiegereltern/eigener Großeltern</option>';
|
str += '<option value="Bestattung G/S/G">g) Teilnahme an Bestattung Geschwister/Schwiegereltern/eigener Großeltern (1 Tag)</option>';
|
||||||
str += '<option value="Wohnungswechsel">h) Wohnungswechsel in eigenen Haushalt</option>';
|
str += '<option value="Wohnungswechsel">h) Wohnungswechsel in eigenen Haushalt (2 Tage)</option>';
|
||||||
str += '<option value="Bundesheer">i) Einberufung Bundesheer</option>';
|
str += '<option value="Bundesheer">i) Einberufung Bundesheer</option>';
|
||||||
str += '</select>';
|
str += '</select>';
|
||||||
|
|
||||||
|
|||||||
@@ -313,5 +313,12 @@
|
|||||||
},
|
},
|
||||||
"config": {
|
"config": {
|
||||||
"bin-dir": "vendor/bin"
|
"bin-dir": "vendor/bin"
|
||||||
|
},
|
||||||
|
"require-dev": {
|
||||||
|
"squizlabs/php_codesniffer": "3.6.*",
|
||||||
|
"phpmd/phpmd": "2.*",
|
||||||
|
"phpmetrics/phpmetrics": "2.*",
|
||||||
|
"sebastian/phpcpd": "3.*"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Generated
+1112
-8
File diff suppressed because it is too large
Load Diff
@@ -254,4 +254,13 @@ define('BIS_STANDORTCODE_LEHRGAENGE', '0');
|
|||||||
|
|
||||||
// bPk Abfrage
|
// bPk Abfrage
|
||||||
define('BPK_FUER_ALLE_BENUTZER_ABFRAGEN', false);
|
define('BPK_FUER_ALLE_BENUTZER_ABFRAGEN', false);
|
||||||
|
|
||||||
|
// Bei folgenden Buchungstypen wird ein Anlegen geprüft ob bereits ein Eintrag für diesen Typ vorhanden ist im selben
|
||||||
|
// Semester und ggf ein Hinweis ausgegeben
|
||||||
|
define('FAS_DOPPELTE_BUCHUNGSTYPEN_CHECK', serialize(
|
||||||
|
array('StudiengebuehrAnzahlung', 'Studiengebuehr', 'StudiengebuehrRestzahlung', 'OEH')
|
||||||
|
));
|
||||||
|
|
||||||
|
// Spezialnoten die am Zeunigs und Diplomasupplement ignoriert werden
|
||||||
|
define('ZEUGNISNOTE_NICHT_ANZEIGEN',serialize(array('iar', 'nz')));
|
||||||
?>
|
?>
|
||||||
|
|||||||
@@ -2272,6 +2272,21 @@ if(!$error)
|
|||||||
$errormsg = 'Fehlerhafte Parameteruebergabe';
|
$errormsg = 'Fehlerhafte Parameteruebergabe';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
elseif(isset($_POST['type']) && $_POST['type']=='checkbuchung')
|
||||||
|
{
|
||||||
|
$person_ids = explode(';',$_POST['person_ids']);
|
||||||
|
$exists = false;
|
||||||
|
if (defined('FAS_DOPPELTE_BUCHUNGSTYPEN_CHECK') && (in_array($_POST['buchungstyp_kurzbz'], unserialize(FAS_DOPPELTE_BUCHUNGSTYPEN_CHECK))))
|
||||||
|
{
|
||||||
|
$konto = new konto();
|
||||||
|
$exists = $konto->checkDoppelteBuchung($person_ids, $_POST['studiensemester_kurzbz'], $_POST['buchungstyp_kurzbz']);
|
||||||
|
}
|
||||||
|
|
||||||
|
if($exists)
|
||||||
|
$return = true;
|
||||||
|
else
|
||||||
|
$return = false;
|
||||||
|
}
|
||||||
elseif(isset($_POST['type']) && $_POST['type']=='neuebuchung')
|
elseif(isset($_POST['type']) && $_POST['type']=='neuebuchung')
|
||||||
{
|
{
|
||||||
//Speichert eine neue Buchung
|
//Speichert eine neue Buchung
|
||||||
|
|||||||
@@ -3085,6 +3085,20 @@ function StudentKontoNeuSpeichern(dialog, person_ids, studiengang_kz)
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var tocheck = <?php echo (defined('FAS_DOPPELTE_BUCHUNGSTYPEN_CHECK') && FAS_DOPPELTE_BUCHUNGSTYPEN_CHECK) ? 'true' : 'false' ?>;
|
||||||
|
|
||||||
|
var exists = false;
|
||||||
|
|
||||||
|
if (tocheck)
|
||||||
|
{
|
||||||
|
exists = StudentCheckBuchung(person_ids, studiensemester_kurzbz, buchungstyp_kurzbz, studiengang_kz);
|
||||||
|
}
|
||||||
|
if (exists)
|
||||||
|
{
|
||||||
|
if(!confirm('Die Buchung ist bereits vorhanden. Trotzdem fortfahren?'))
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
req.add('type', 'neuebuchung');
|
req.add('type', 'neuebuchung');
|
||||||
|
|
||||||
req.add('person_ids', person_ids);
|
req.add('person_ids', person_ids);
|
||||||
@@ -3116,6 +3130,28 @@ function StudentKontoNeuSpeichern(dialog, person_ids, studiengang_kz)
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
// ****
|
||||||
|
// * Prüft ob die Buchung bereits vorhanden ist
|
||||||
|
// ****
|
||||||
|
function StudentCheckBuchung(person_ids, studiensemester_kurzbz, buchungstyp_kurzbz, studiengang_kz)
|
||||||
|
{
|
||||||
|
netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
|
||||||
|
|
||||||
|
var url = '<?php echo APP_ROOT ?>content/student/studentDBDML.php';
|
||||||
|
var req = new phpRequest(url,'','');
|
||||||
|
req.add('type', 'checkbuchung');
|
||||||
|
|
||||||
|
req.add('person_ids', person_ids);
|
||||||
|
req.add('studiensemester_kurzbz', studiensemester_kurzbz);
|
||||||
|
req.add('buchungstyp_kurzbz', buchungstyp_kurzbz);
|
||||||
|
req.add('studiengang_kz', studiengang_kz);
|
||||||
|
|
||||||
|
var response = req.executePOST();
|
||||||
|
|
||||||
|
var val = new ParseReturnValue(response);
|
||||||
|
|
||||||
|
return(val.dbdml_return);
|
||||||
|
}
|
||||||
|
|
||||||
// *****
|
// *****
|
||||||
// * Druckt eine Zahlungsbestaetigung aus
|
// * Druckt eine Zahlungsbestaetigung aus
|
||||||
|
|||||||
@@ -1182,4 +1182,18 @@ function generateUniqueToken($length = 64)
|
|||||||
|
|
||||||
return $token;
|
return $token;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Berechnet die Anzahl von ganzen Tagen zwischen zwei Daten
|
||||||
|
* @param string $date1 Datum im Format '2022-02-22'.
|
||||||
|
* @param string $date2 Datum im Format '2022-04-22'.
|
||||||
|
* @return Anzahl der Tage
|
||||||
|
*/
|
||||||
|
function anzahlTage($date1, $date2)
|
||||||
|
{
|
||||||
|
$date1_ts = strtotime($date1);
|
||||||
|
$date2_ts = strtotime($date2);
|
||||||
|
$diff = $date2_ts - $date1_ts;
|
||||||
|
return round($diff / 86400);
|
||||||
|
}
|
||||||
?>
|
?>
|
||||||
|
|||||||
+40
-9
@@ -553,31 +553,38 @@ class konto extends basis_db
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Überprüft, ob das Konto einer Person ausgeglichen ist, oder ob noch Zahlungen offen sind
|
* Überprüft, ob das Konto einer Person ausgeglichen ist, oder ob noch Zahlungen offen sind
|
||||||
* @param $person_id ID der Person, die geprüft werden soll
|
* @param int $person_id ID der Person, die geprüft werden soll.
|
||||||
* @return true wenn ausgeglichen, false wenn Zahlungen offen, false mit errormsg wenn ein Fehler aufgetreten ist
|
* @param bool $aktuelleBuchungenOnly True, wenn nur Zahlungen mit Buchungsdatum <= aktuelles Datum berücksichtigt werden sollen.
|
||||||
|
* @return boolean true wenn ausgeglichen, false wenn Zahlungen offen, false mit errormsg wenn ein Fehler aufgetreten ist
|
||||||
*/
|
*/
|
||||||
public function checkKontostand($person_id)
|
public function checkKontostand($person_id, $aktuelleBuchungenOnly = false)
|
||||||
{
|
{
|
||||||
$qry="SELECT sum(betrag) as summe FROM public.tbl_konto WHERE person_id=".$this->db_add_param($person_id);
|
$qry = "SELECT sum(betrag) as summe
|
||||||
if($result=$this->db_query($qry))
|
FROM public.tbl_konto
|
||||||
|
WHERE person_id=".$this->db_add_param($person_id);
|
||||||
|
|
||||||
|
if($aktuelleBuchungenOnly)
|
||||||
|
$qry .= " AND buchungsdatum <= now()";
|
||||||
|
|
||||||
|
if ($result = $this->db_query($qry))
|
||||||
{
|
{
|
||||||
if($row=$this->db_fetch_object())
|
if ($row = $this->db_fetch_object())
|
||||||
{
|
{
|
||||||
if($row->summe>=0)
|
if ($row->summe >= 0)
|
||||||
return true;
|
return true;
|
||||||
else
|
else
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
$this->errormsg = "Fehler beim Holen der Daten";
|
||||||
return false;
|
return false;
|
||||||
$this->errormsg="Fehler beim Holen der Daten";
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
$this->errormsg = "Fehler bei der Datenbankabfrage";
|
||||||
return false;
|
return false;
|
||||||
$this->errormsg="Fehler bei der Datenbankabfrage";
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -957,6 +964,30 @@ class konto extends basis_db
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function checkDoppelteBuchung($person_ids, $stsem, $typ)
|
||||||
|
{
|
||||||
|
$qry = "SELECT betrag
|
||||||
|
FROM public.tbl_konto
|
||||||
|
JOIN public.tbl_benutzer benutzer USING(person_id)
|
||||||
|
WHERE person_id IN (".$this->implode4SQL(array_filter($person_ids)).")
|
||||||
|
AND studiensemester_kurzbz = ".$this->db_add_param($stsem)."
|
||||||
|
AND buchungstyp_kurzbz = ".$this->db_add_param($typ)."
|
||||||
|
GROUP BY buchungsnr";
|
||||||
|
|
||||||
|
if ($result = $this->db_query($qry))
|
||||||
|
{
|
||||||
|
if ($this->db_num_rows($result) > 0)
|
||||||
|
return true;
|
||||||
|
else
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
$this->errormsg = 'Fehler bei der Abfrage aufgetreten';
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
?>
|
?>
|
||||||
|
|||||||
@@ -202,9 +202,12 @@ class LehreListHelper
|
|||||||
$qry = 'SELECT
|
$qry = 'SELECT
|
||||||
distinct on(nachname, vorname, person_id) vorname, nachname, matrikelnr, public.tbl_student.student_uid,
|
distinct on(nachname, vorname, person_id) vorname, nachname, matrikelnr, public.tbl_student.student_uid,
|
||||||
tbl_studentlehrverband.semester, tbl_studentlehrverband.verband, tbl_studentlehrverband.gruppe,
|
tbl_studentlehrverband.semester, tbl_studentlehrverband.verband, tbl_studentlehrverband.gruppe,
|
||||||
(SELECT status_kurzbz FROM public.tbl_prestudentstatus WHERE prestudent_id=tbl_student.prestudent_id ORDER BY datum DESC, insertamum DESC, ext_id DESC LIMIT 1) as status,
|
(SELECT status_kurzbz FROM public.tbl_prestudentstatus
|
||||||
|
WHERE prestudent_id=tbl_student.prestudent_id
|
||||||
|
ORDER BY datum DESC, insertamum DESC, ext_id DESC LIMIT 1) as status,
|
||||||
tbl_bisio.bisio_id, tbl_bisio.von, tbl_bisio.bis, tbl_student.studiengang_kz AS stg_kz_student,
|
tbl_bisio.bisio_id, tbl_bisio.von, tbl_bisio.bis, tbl_student.studiengang_kz AS stg_kz_student,
|
||||||
tbl_note.lkt_ueberschreibbar, tbl_note.anmerkung, tbl_mitarbeiter.mitarbeiter_uid, tbl_person.matr_nr, tbl_studiengang.kurzbzlang, tbl_mobilitaet.mobilitaetstyp_kurzbz,
|
tbl_note.lkt_ueberschreibbar, tbl_note.anmerkung, tbl_mitarbeiter.mitarbeiter_uid, tbl_person.matr_nr, tbl_studiengang.kurzbzlang,
|
||||||
|
tbl_mobilitaet.mobilitaetstyp_kurzbz, tbl_zeugnisnote.note,
|
||||||
(CASE WHEN bis.tbl_mobilitaet.studiensemester_kurzbz = vw_student_lehrveranstaltung.studiensemester_kurzbz THEN 1 ELSE 0 END) as doubledegree
|
(CASE WHEN bis.tbl_mobilitaet.studiensemester_kurzbz = vw_student_lehrveranstaltung.studiensemester_kurzbz THEN 1 ELSE 0 END) as doubledegree
|
||||||
FROM
|
FROM
|
||||||
campus.vw_student_lehrveranstaltung
|
campus.vw_student_lehrveranstaltung
|
||||||
@@ -212,7 +215,9 @@ class LehreListHelper
|
|||||||
JOIN public.tbl_person USING(person_id) LEFT JOIN public.tbl_student ON(uid=student_uid)
|
JOIN public.tbl_person USING(person_id) LEFT JOIN public.tbl_student ON(uid=student_uid)
|
||||||
LEFT JOIN public.tbl_mitarbeiter ON(uid=mitarbeiter_uid)
|
LEFT JOIN public.tbl_mitarbeiter ON(uid=mitarbeiter_uid)
|
||||||
LEFT JOIN public.tbl_studentlehrverband USING(student_uid,studiensemester_kurzbz)
|
LEFT JOIN public.tbl_studentlehrverband USING(student_uid,studiensemester_kurzbz)
|
||||||
LEFT JOIN lehre.tbl_zeugnisnote on(vw_student_lehrveranstaltung.lehrveranstaltung_id=tbl_zeugnisnote.lehrveranstaltung_id AND tbl_zeugnisnote.student_uid=tbl_student.student_uid AND tbl_zeugnisnote.studiensemester_kurzbz=tbl_studentlehrverband.studiensemester_kurzbz)
|
LEFT JOIN lehre.tbl_zeugnisnote on(vw_student_lehrveranstaltung.lehrveranstaltung_id=tbl_zeugnisnote.lehrveranstaltung_id
|
||||||
|
AND tbl_zeugnisnote.student_uid=tbl_student.student_uid
|
||||||
|
AND tbl_zeugnisnote.studiensemester_kurzbz=tbl_studentlehrverband.studiensemester_kurzbz)
|
||||||
LEFT JOIN lehre.tbl_note USING (note)
|
LEFT JOIN lehre.tbl_note USING (note)
|
||||||
LEFT JOIN bis.tbl_bisio ON(uid=tbl_bisio.student_uid)
|
LEFT JOIN bis.tbl_bisio ON(uid=tbl_bisio.student_uid)
|
||||||
LEFT JOIN public.tbl_studiengang ON(tbl_student.studiengang_kz=tbl_studiengang.studiengang_kz)
|
LEFT JOIN public.tbl_studiengang ON(tbl_student.studiengang_kz=tbl_studiengang.studiengang_kz)
|
||||||
@@ -254,8 +259,10 @@ class LehreListHelper
|
|||||||
else
|
else
|
||||||
$zusatz='';
|
$zusatz='';
|
||||||
|
|
||||||
if($row->bisio_id!='' && $row->status!='Incoming' && ($row->bis > $stsemdatumvon || $row->bis=='') && $row->von < $stsemdatumbis) //Outgoing
|
//Outgoing
|
||||||
$zusatz.='(o)(ab '.$datum->formatDatum($row->von,'d.m.Y').')';
|
if($row->bisio_id != '' && $row->status != 'Incoming' && ($row->bis > $stsemdatumvon || $row->bis == '')
|
||||||
|
&& $row->von < $stsemdatumbis && (anzahlTage($row->von, $row->bis) >= 30))
|
||||||
|
$zusatz .= '(o)(ab '.$datum->formatDatum($row->von, 'd.m.Y').')';
|
||||||
|
|
||||||
if($row->lkt_ueberschreibbar == 'f') // angerechnet / intern angerechnet / nicht zugelassen
|
if($row->lkt_ueberschreibbar == 'f') // angerechnet / intern angerechnet / nicht zugelassen
|
||||||
$zusatz.= '('. $row->anmerkung. ')';
|
$zusatz.= '('. $row->anmerkung. ')';
|
||||||
@@ -281,7 +288,8 @@ class LehreListHelper
|
|||||||
'gruppe'=>trim($row->gruppe),
|
'gruppe'=>trim($row->gruppe),
|
||||||
'zusatz'=>$zusatz,
|
'zusatz'=>$zusatz,
|
||||||
'studiengang_kurzbz'=>$row->kurzbzlang,
|
'studiengang_kurzbz'=>$row->kurzbzlang,
|
||||||
'mobilitaetstyp_kurzbz'=>$row->mobilitaetstyp_kurzbz
|
'mobilitaetstyp_kurzbz'=>$row->mobilitaetstyp_kurzbz,
|
||||||
|
'note'=>$row->note
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -834,11 +834,26 @@ class prestudent extends person
|
|||||||
$stg_obj = new studiengang();
|
$stg_obj = new studiengang();
|
||||||
$stg_obj->load($studiengang_kz);
|
$stg_obj->load($studiengang_kz);
|
||||||
if($stg_obj->typ=='m')
|
if($stg_obj->typ=='m')
|
||||||
$qry.=" AND a.rolle='Interessent' AND a.zgvmas_code is not null AND a.zgvmas_erfuellt = 't'";
|
{
|
||||||
|
$qry.=" AND a.rolle='Interessent' AND a.zgvmas_code is not null";
|
||||||
|
|
||||||
|
if (defined('ZGV_ERFUELLT_ANZEIGEN') && ZGV_ERFUELLT_ANZEIGEN)
|
||||||
|
$qry .= " AND a.zgvmas_erfuellt = 't'";
|
||||||
|
}
|
||||||
elseif($stg_obj->typ=='p')
|
elseif($stg_obj->typ=='p')
|
||||||
$qry.=" AND a.rolle='Interessent' AND a.zgvdoktor_code is not null AND a.zgvdoktor_erfuellt = 't'";
|
{
|
||||||
|
$qry.=" AND a.rolle='Interessent' AND a.zgvdoktor_code is not null";
|
||||||
|
|
||||||
|
if (defined('ZGV_DOKTOR_ANZEIGEN') && ZGV_DOKTOR_ANZEIGEN)
|
||||||
|
$qry .= " AND a.zgvdoktor_erfuellt = 't'";
|
||||||
|
}
|
||||||
else
|
else
|
||||||
$qry.=" AND a.rolle='Interessent' AND a.zgv_code is not null AND a.zgv_erfuellt = 't'";
|
{
|
||||||
|
$qry.=" AND a.rolle='Interessent' AND a.zgv_code is not null";
|
||||||
|
|
||||||
|
if (defined('ZGV_ERFUELLT_ANZEIGEN') && ZGV_ERFUELLT_ANZEIGEN)
|
||||||
|
$qry .= " AND a.zgv_erfuellt = 't'";
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
case "reihungstestangemeldet":
|
case "reihungstestangemeldet":
|
||||||
$qry.="
|
$qry.="
|
||||||
|
|||||||
@@ -256,7 +256,7 @@ class zeugnisnote extends basis_db
|
|||||||
* $studiensemester_kurzbz
|
* $studiensemester_kurzbz
|
||||||
* @return true wenn ok, false wenn Fehler
|
* @return true wenn ok, false wenn Fehler
|
||||||
*/
|
*/
|
||||||
public function getZeugnisnoten($lehrveranstaltung_id, $student_uid, $studiensemester_kurzbz)
|
public function getZeugnisnoten($lehrveranstaltung_id, $student_uid, $studiensemester_kurzbz, $nichtAnzeigen = null)
|
||||||
{
|
{
|
||||||
$where='';
|
$where='';
|
||||||
if($lehrveranstaltung_id!=null)
|
if($lehrveranstaltung_id!=null)
|
||||||
@@ -265,6 +265,8 @@ class zeugnisnote extends basis_db
|
|||||||
$where.=" AND uid=".$this->db_add_param($student_uid);
|
$where.=" AND uid=".$this->db_add_param($student_uid);
|
||||||
if($studiensemester_kurzbz!=null)
|
if($studiensemester_kurzbz!=null)
|
||||||
$where.=" AND vw_student_lehrveranstaltung.studiensemester_kurzbz=".$this->db_add_param($studiensemester_kurzbz);
|
$where.=" AND vw_student_lehrveranstaltung.studiensemester_kurzbz=".$this->db_add_param($studiensemester_kurzbz);
|
||||||
|
if ($nichtAnzeigen != null)
|
||||||
|
$where.=" AND tbl_note.anmerkung NOT IN (".$this->db_implode4SQL($nichtAnzeigen).")";
|
||||||
$where2='';
|
$where2='';
|
||||||
if($lehrveranstaltung_id!=null)
|
if($lehrveranstaltung_id!=null)
|
||||||
$where2.=" AND lehrveranstaltung_id=".$this->db_add_param($lehrveranstaltung_id, FHC_INTEGER);
|
$where2.=" AND lehrveranstaltung_id=".$this->db_add_param($lehrveranstaltung_id, FHC_INTEGER);
|
||||||
@@ -272,6 +274,8 @@ class zeugnisnote extends basis_db
|
|||||||
$where2.=" AND student_uid=".$this->db_add_param($student_uid);
|
$where2.=" AND student_uid=".$this->db_add_param($student_uid);
|
||||||
if($studiensemester_kurzbz!=null)
|
if($studiensemester_kurzbz!=null)
|
||||||
$where2.=" AND studiensemester_kurzbz=".$this->db_add_param($studiensemester_kurzbz);
|
$where2.=" AND studiensemester_kurzbz=".$this->db_add_param($studiensemester_kurzbz);
|
||||||
|
if ($nichtAnzeigen != null)
|
||||||
|
$where2.=" AND tbl_note.anmerkung NOT IN (".$this->db_implode4SQL($nichtAnzeigen).")";
|
||||||
|
|
||||||
$qry = "SELECT vw_student_lehrveranstaltung.lehrveranstaltung_id, uid,
|
$qry = "SELECT vw_student_lehrveranstaltung.lehrveranstaltung_id, uid,
|
||||||
vw_student_lehrveranstaltung.studiensemester_kurzbz, note, punkte, uebernahmedatum, benotungsdatum,
|
vw_student_lehrveranstaltung.studiensemester_kurzbz, note, punkte, uebernahmedatum, benotungsdatum,
|
||||||
|
|||||||
@@ -1,127 +0,0 @@
|
|||||||
# Globally valid entries
|
|
||||||
build_settings:
|
|
||||||
ignore: # Ignores vendor and tests folders
|
|
||||||
- "vendor"
|
|
||||||
- "tests"
|
|
||||||
pgsql: # PostgreSQL connection parameters
|
|
||||||
host: "localhost;dbname=template1" # Connects to the template1 database to be able to drop database fhcomplete
|
|
||||||
user: "fhcomplete"
|
|
||||||
pass: "fhcomplete"
|
|
||||||
|
|
||||||
setup: # First!
|
|
||||||
pgsql: # Close previous connections to database -> drop database -> create database
|
|
||||||
- "SELECT pg_terminate_backend(pid) FROM pg_stat_activity WHERE pid <> pg_backend_pid() AND datname = 'fhcomplete';"
|
|
||||||
- "DROP DATABASE IF EXISTS fhcomplete;"
|
|
||||||
- "CREATE DATABASE fhcomplete;"
|
|
||||||
composer: # Run composer to install all the required 3rd party software
|
|
||||||
shell:
|
|
||||||
# Install addons
|
|
||||||
- "git clone --quiet https://github.com/FH-Complete/FHC-AddOn-Abrechnung.git %BUILD_PATH%/addons/abrechnung"
|
|
||||||
- "git clone --quiet https://github.com/FH-Complete/FHC-AddOn-Asterisk.git %BUILD_PATH%/addons/asterisk"
|
|
||||||
- "git clone --quiet https://github.com/FH-Complete/FHC-AddOn-Aufnahme.git %BUILD_PATH%/addons/aufnahme"
|
|
||||||
- "git clone --quiet https://github.com/FH-Complete/FHC-AddOn-Bewerbung.git %BUILD_PATH%/addons/bewerbung"
|
|
||||||
- "git clone --quiet https://github.com/FH-Complete/FHC-AddOn-CaseTime.git %BUILD_PATH%/addons/casetime"
|
|
||||||
- "git clone --quiet https://github.com/FH-Complete/FHC-AddOn-LDAP.git %BUILD_PATH%/addons/ldap"
|
|
||||||
- "git clone --quiet https://github.com/FH-Complete/FHC-AddOn-Lehrmittel.git %BUILD_PATH%/addons/lehrmittel"
|
|
||||||
- "git clone --quiet https://github.com/FH-Complete/FHC-AddOn-LV-Evaluierung.git %BUILD_PATH%/addons/lvevaluierung"
|
|
||||||
- "git clone --quiet https://github.com/FH-Complete/FHC-AddOn-LVInfo.git %BUILD_PATH%/addons/lvinfo"
|
|
||||||
- "git clone --quiet https://github.com/FH-Complete/FHC-AddOn-Kompetenzen.git %BUILD_PATH%/addons/kompetenzen"
|
|
||||||
- "git clone --quiet https://github.com/FH-Complete/FHC-AddOn-Moodle.git %BUILD_PATH%/addons/moodle"
|
|
||||||
- "git clone --quiet https://github.com/FH-Complete/FHC-AddOn-Reports.git %BUILD_PATH%/addons/reports"
|
|
||||||
- "git clone --quiet https://github.com/FH-Complete/FHC-AddOn-Studiengangsverwaltung.git %BUILD_PATH%/addons/studiengangsverwaltung"
|
|
||||||
- "git clone --quiet https://github.com/FH-Complete/FHC-AddOn-Textbausteine.git %BUILD_PATH%/addons/textbausteine"
|
|
||||||
- "git clone --quiet https://github.com/FH-Complete/FHC-AddOn-WaWi.git %BUILD_PATH%/addons/wawi"
|
|
||||||
# Copy addons configs
|
|
||||||
- "cp -R /var/www/configs/fhc/abrechnung/* %BUILD_PATH%/addons/abrechnung"
|
|
||||||
- "cp -R /var/www/configs/fhc/asterisk/* %BUILD_PATH%/addons/asterisk"
|
|
||||||
- "cp -R /var/www/configs/fhc/bewerbung/* %BUILD_PATH%/addons/bewerbung"
|
|
||||||
- "cp -R /var/www/configs/fhc/casetime/* %BUILD_PATH%/addons/casetime"
|
|
||||||
- "cp -R /var/www/configs/fhc/lehrmittel/* %BUILD_PATH%/addons/lehrmittel"
|
|
||||||
- "cp -R /var/www/configs/fhc/lvinfo/* %BUILD_PATH%/addons/lvinfo"
|
|
||||||
- "cp -R /var/www/configs/fhc/reports/* %BUILD_PATH%/addons/reports"
|
|
||||||
- "cp -R /var/www/configs/fhc/wawi/* %BUILD_PATH%/addons/wawi"
|
|
||||||
# Copy core configs and .htaccess
|
|
||||||
- "cp -R /var/www/configs/fhc/configs/* ./config"
|
|
||||||
- "cp /var/www/configs/fhc/configs/.htaccess ./cis/private/"
|
|
||||||
- "cp /var/www/configs/fhc/configs/.htaccess ./content"
|
|
||||||
- "cp /var/www/configs/fhc/configs/.htaccess ./rdf"
|
|
||||||
- "cp /var/www/configs/fhc/configs/.htaccess ./system"
|
|
||||||
- "cp /var/www/configs/fhc/configs/.htaccess ./vilesci"
|
|
||||||
# Create core directories
|
|
||||||
- "mkdir documents"
|
|
||||||
- "mkdir documents/csv_import"
|
|
||||||
- "mkdir documents/dms"
|
|
||||||
- "mkdir documents/import"
|
|
||||||
- "mkdir documents/benotungstool"
|
|
||||||
- "mkdir paabgabe"
|
|
||||||
# Copy codeigniter configs
|
|
||||||
- "mkdir ./application/config/development"
|
|
||||||
- "cp -R /var/www/configs/ci/* ./application/config/development"
|
|
||||||
# Clone extensions
|
|
||||||
- "git clone --quiet https://github.com/FH-Complete/FHC-Core-MobilityOnline.git /tmp/FHC-Core-MobilityOnline"
|
|
||||||
- "git clone --quiet https://github.com/FH-Complete/FHC-Core-Budget.git /tmp/FHC-Core-Budget"
|
|
||||||
- "git clone --quiet https://github.com/FH-Complete/FHC-Core-DSMS.git /tmp/FHC-Core-DSMS"
|
|
||||||
- "git clone --quiet https://github.com/FH-Complete/FHC-Core-Nextcloud.git /tmp/FHC-Core-Nextcloud"
|
|
||||||
# Create extensions archives
|
|
||||||
- "tar cfzP /tmp/FHC-Core-MobilityOnline.tgz /tmp/FHC-Core-MobilityOnline/"
|
|
||||||
- "tar cfzP /tmp/FHC-Core-Budget.tgz /tmp/FHC-Core-Budget/"
|
|
||||||
- "tar cfzP /tmp/FHC-Core-DSMS.tgz /tmp/FHC-Core-DSMS/"
|
|
||||||
- "tar cfzP /tmp/FHC-Core-Nextcloud.tgz /tmp/FHC-Core-Nextcloud/"
|
|
||||||
# Install extensions
|
|
||||||
#- "php index.ci.php system/extensions/CLI_Manager uploadExtension FHC-Core-MobilityOnline /tmp/FHC-Core-MobilityOnline.tgz"
|
|
||||||
#- "php index.ci.php system/extensions/CLI_Manager uploadExtension FHC-Core-Budget /tmp/FHC-Core-Budget.tgz"
|
|
||||||
#- "php index.ci.php system/extensions/CLI_Manager uploadExtension FHC-Core-DSMS /tmp/FHC-Core-DSMS.tgz"
|
|
||||||
#- "php index.ci.php system/extensions/CLI_Manager uploadExtension FHC-Core-Nextcloud /tmp/FHC-Core-Nextcloud.tgz"
|
|
||||||
# Remove temporary files
|
|
||||||
- "rm -fR /tmp/FHC-Core-MobilityOnline*"
|
|
||||||
- "rm -fR /tmp/FHC-Core-Budget*"
|
|
||||||
- "rm -fR /tmp/FHC-Core-DSMS*"
|
|
||||||
- "rm -fR /tmp/FHC-Core-Nextcloud*"
|
|
||||||
# Change files permissions
|
|
||||||
- "chmod -R 0770 *"
|
|
||||||
- "find . -type f -exec chmod 0644 {} \\;"
|
|
||||||
# Create a symlink to the current build folder
|
|
||||||
- "ln -s %BUILD_PATH% ../fhcomplete"
|
|
||||||
|
|
||||||
test: # Run tests
|
|
||||||
php_parallel_lint: # Lint cannot fail!
|
|
||||||
php_mess_detector: # Mess detector
|
|
||||||
rules:
|
|
||||||
- "unusedcode"
|
|
||||||
- "codesize"
|
|
||||||
- "design"
|
|
||||||
allow_failures: true
|
|
||||||
php_cpd: # Copy/paste detector
|
|
||||||
ignore:
|
|
||||||
- "rdf"
|
|
||||||
- "config"
|
|
||||||
- "locale"
|
|
||||||
- "application/config"
|
|
||||||
- "application/views"
|
|
||||||
# Global ignore is overwritten by the specific one
|
|
||||||
- "vendor"
|
|
||||||
- "tests"
|
|
||||||
allow_failures: true
|
|
||||||
php_code_sniffer: # Code sniffer
|
|
||||||
standard: "tests/codesniffer/FHComplete"
|
|
||||||
ignore:
|
|
||||||
- "rdf"
|
|
||||||
- "locale"
|
|
||||||
- "application/views"
|
|
||||||
allowed_warnings: -1 # Warnings are ignored for a successful build
|
|
||||||
allow_failures: true
|
|
||||||
#codeception: # Codeception
|
|
||||||
# config: "tests/codeception/"
|
|
||||||
# path: "tests/codeception/_output/"
|
|
||||||
# allow_failures: true
|
|
||||||
|
|
||||||
failure: # On failure
|
|
||||||
email: # Send an email to warn the team
|
|
||||||
default_mailto_address: [email protected]
|
|
||||||
|
|
||||||
complete: # Last!
|
|
||||||
pgsql: # Close previous connections to database -> drop database
|
|
||||||
- "SELECT pg_terminate_backend(pid) FROM pg_stat_activity WHERE pid <> pg_backend_pid() AND datname = 'fhcomplete';"
|
|
||||||
- "DROP DATABASE IF EXISTS fhcomplete;"
|
|
||||||
shell: # Remove the previously created symlink
|
|
||||||
- "rm ../fhcomplete"
|
|
||||||
@@ -3,6 +3,8 @@ const ANRECHNUNGSTATUS_REJECTED = 'rejected';
|
|||||||
const HERKUNFT_DER_KENNTNISSE_MAX_LENGTH = 125;
|
const HERKUNFT_DER_KENNTNISSE_MAX_LENGTH = 125;
|
||||||
|
|
||||||
$(function(){
|
$(function(){
|
||||||
|
const uploadMaxFilesize = $('#requestAnrechnung-uploadfile').data('maxsize') ; // in byte
|
||||||
|
|
||||||
// Set status alert color
|
// Set status alert color
|
||||||
requestAnrechnung.setStatusAlertColor();
|
requestAnrechnung.setStatusAlertColor();
|
||||||
|
|
||||||
@@ -26,6 +28,12 @@ $(function(){
|
|||||||
// Avoid form redirecting automatically
|
// Avoid form redirecting automatically
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
|
|
||||||
|
var fileInput = $('#requestAnrechnung-uploadfile');
|
||||||
|
if (!requestAnrechnung.fileSizeOk(fileInput, uploadMaxFilesize)) // in byte
|
||||||
|
{
|
||||||
|
return FHC_DialogLib.alertWarning(FHC_PhrasesLib.t("ui", "errorDokumentZuGross"));
|
||||||
|
}
|
||||||
|
|
||||||
FHC_AjaxClient.ajaxCallPost(
|
FHC_AjaxClient.ajaxCallPost(
|
||||||
FHC_JS_DATA_STORAGE_OBJECT.called_path + "/apply",
|
FHC_JS_DATA_STORAGE_OBJECT.called_path + "/apply",
|
||||||
{
|
{
|
||||||
@@ -161,5 +169,19 @@ var requestAnrechnung = {
|
|||||||
|
|
||||||
// Disable all form elements
|
// Disable all form elements
|
||||||
$("#requestAnrechnung-form :input").prop("disabled", true);
|
$("#requestAnrechnung-form :input").prop("disabled", true);
|
||||||
|
},
|
||||||
|
fileSizeOk: function(fileInput, maxSize){
|
||||||
|
|
||||||
|
if (fileInput.get(0).files.length){
|
||||||
|
|
||||||
|
var fileSize = fileInput.get(0).files[0].size; // in bytes
|
||||||
|
|
||||||
|
if (fileSize > maxSize)
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -649,7 +649,16 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
|
|||||||
WHERE
|
WHERE
|
||||||
student_uid = ".$db->db_add_param($uid_arr[$i])."
|
student_uid = ".$db->db_add_param($uid_arr[$i])."
|
||||||
AND zeugnis = true
|
AND zeugnis = true
|
||||||
AND studiensemester_kurzbz in (".$sqlStudent->implode4SQL($aktuellesSemester).")
|
AND studiensemester_kurzbz in (".$sqlStudent->implode4SQL($aktuellesSemester).")";
|
||||||
|
|
||||||
|
if (defined('ZEUGNISNOTE_NICHT_ANZEIGEN'))
|
||||||
|
{
|
||||||
|
$qry .="
|
||||||
|
AND note.anmerkung NOT IN (".$sqlStudent->implode4SQL(unserialize(ZEUGNISNOTE_NICHT_ANZEIGEN)).")
|
||||||
|
";
|
||||||
|
};
|
||||||
|
|
||||||
|
$qry .= "
|
||||||
AND NOT EXISTS(SELECT 1 FROM bis.tbl_bisio JOIN lehre.tbl_lehreinheit USING(lehreinheit_id)
|
AND NOT EXISTS(SELECT 1 FROM bis.tbl_bisio JOIN lehre.tbl_lehreinheit USING(lehreinheit_id)
|
||||||
WHERE lehrveranstaltung_id=tbl_lehrveranstaltung.lehrveranstaltung_id
|
WHERE lehrveranstaltung_id=tbl_lehrveranstaltung.lehrveranstaltung_id
|
||||||
AND student_uid=".$db->db_add_param($uid_arr[$i])."
|
AND student_uid=".$db->db_add_param($uid_arr[$i])."
|
||||||
@@ -916,6 +925,13 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
|
|||||||
lehrveranstaltung_id = ".$db->db_add_param($row_outgoing->lehrveranstaltung_id)."
|
lehrveranstaltung_id = ".$db->db_add_param($row_outgoing->lehrveranstaltung_id)."
|
||||||
AND student_uid = ".$db->db_add_param($uid_arr[$i]);
|
AND student_uid = ".$db->db_add_param($uid_arr[$i]);
|
||||||
|
|
||||||
|
if (defined('ZEUGNISNOTE_NICHT_ANZEIGEN'))
|
||||||
|
{
|
||||||
|
$qry_outgoing_note .= "
|
||||||
|
AND tbl_note.anmerkung NOT IN (".$db->implode4SQL(unserialize(ZEUGNISNOTE_NICHT_ANZEIGEN)).")
|
||||||
|
";
|
||||||
|
};
|
||||||
|
|
||||||
if($result_outgoing_note = $db->db_query($qry_outgoing_note))
|
if($result_outgoing_note = $db->db_query($qry_outgoing_note))
|
||||||
{
|
{
|
||||||
if($row_outgoing_note = $db->db_fetch_object($result_outgoing_note))
|
if($row_outgoing_note = $db->db_fetch_object($result_outgoing_note))
|
||||||
|
|||||||
+1
-3
@@ -256,9 +256,7 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
|
|||||||
}
|
}
|
||||||
|
|
||||||
$obj = new zeugnisnote();
|
$obj = new zeugnisnote();
|
||||||
|
$obj->getZeugnisnoten($lehrveranstaltung_id=null, $uid_arr[$i], $studiensemester_kurzbz, (defined('ZEUGNISNOTE_NICHT_ANZEIGEN')) ? unserialize(ZEUGNISNOTE_NICHT_ANZEIGEN) : null);
|
||||||
$obj->getZeugnisnoten($lehrveranstaltung_id=null, $uid_arr[$i], $studiensemester_kurzbz);
|
|
||||||
|
|
||||||
$ects_gesamt = $ects_gesamt_positiv = 0;
|
$ects_gesamt = $ects_gesamt_positiv = 0;
|
||||||
$prestudent_id = $row->prestudent_id;
|
$prestudent_id = $row->prestudent_id;
|
||||||
|
|
||||||
|
|||||||
@@ -12349,6 +12349,46 @@ array(
|
|||||||
)
|
)
|
||||||
)
|
)
|
||||||
),
|
),
|
||||||
|
array(
|
||||||
|
'app' => 'core',
|
||||||
|
'category' => 'ui',
|
||||||
|
'phrase' => 'errorDokumentZuGross',
|
||||||
|
'insertvon' => 'system',
|
||||||
|
'phrases' => array(
|
||||||
|
array(
|
||||||
|
'sprache' => 'German',
|
||||||
|
'text' => "Dokument zu groß",
|
||||||
|
'description' => '',
|
||||||
|
'insertvon' => 'system'
|
||||||
|
),
|
||||||
|
array(
|
||||||
|
'sprache' => 'English',
|
||||||
|
'text' => "Document maximum size exceeded",
|
||||||
|
'description' => '',
|
||||||
|
'insertvon' => 'system'
|
||||||
|
)
|
||||||
|
)
|
||||||
|
),
|
||||||
|
array(
|
||||||
|
'app' => 'core',
|
||||||
|
'category' => 'ui',
|
||||||
|
'phrase' => 'errorUploadFehltOderZuGross',
|
||||||
|
'insertvon' => 'system',
|
||||||
|
'phrases' => array(
|
||||||
|
array(
|
||||||
|
'sprache' => 'German',
|
||||||
|
'text' => "Dokument fehlt oder zu groß",
|
||||||
|
'description' => '',
|
||||||
|
'insertvon' => 'system'
|
||||||
|
),
|
||||||
|
array(
|
||||||
|
'sprache' => 'English',
|
||||||
|
'text' => "Document missing or maximum size exceeded",
|
||||||
|
'description' => '',
|
||||||
|
'insertvon' => 'system'
|
||||||
|
)
|
||||||
|
)
|
||||||
|
),
|
||||||
array(
|
array(
|
||||||
'app' => 'core',
|
'app' => 'core',
|
||||||
'category' => 'ui',
|
'category' => 'ui',
|
||||||
|
|||||||
@@ -1,2 +0,0 @@
|
|||||||
<?php
|
|
||||||
// This is global bootstrap for autoloading
|
|
||||||
@@ -1,26 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Inherited Methods
|
|
||||||
* @method void wantToTest($text)
|
|
||||||
* @method void wantTo($text)
|
|
||||||
* @method void execute($callable)
|
|
||||||
* @method void expectTo($prediction)
|
|
||||||
* @method void expect($prediction)
|
|
||||||
* @method void amGoingTo($argumentation)
|
|
||||||
* @method void am($role)
|
|
||||||
* @method void lookForwardTo($achieveValue)
|
|
||||||
* @method void comment($description)
|
|
||||||
* @method \Codeception\Lib\Friend haveFriend($name, $actorClass = NULL)
|
|
||||||
*
|
|
||||||
* @SuppressWarnings(PHPMD)
|
|
||||||
*/
|
|
||||||
class AcceptanceTester extends \Codeception\Actor
|
|
||||||
{
|
|
||||||
use _generated\AcceptanceTesterActions;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Define custom actions here
|
|
||||||
*/
|
|
||||||
}
|
|
||||||
@@ -1,39 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Inherited Methods
|
|
||||||
* @method void wantToTest($text)
|
|
||||||
* @method void wantTo($text)
|
|
||||||
* @method void execute($callable)
|
|
||||||
* @method void expectTo($prediction)
|
|
||||||
* @method void expect($prediction)
|
|
||||||
* @method void amGoingTo($argumentation)
|
|
||||||
* @method void am($role)
|
|
||||||
* @method void lookForwardTo($achieveValue)
|
|
||||||
* @method void comment($description)
|
|
||||||
* @method \Codeception\Lib\Friend haveFriend($name, $actorClass = NULL)
|
|
||||||
*
|
|
||||||
* @SuppressWarnings(PHPMD)
|
|
||||||
*/
|
|
||||||
class ApiTester extends \Codeception\Actor
|
|
||||||
{
|
|
||||||
const WAIT = 70000; // 0.07 seconds
|
|
||||||
|
|
||||||
use _generated\ApiTesterActions;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Define custom actions here
|
|
||||||
*/
|
|
||||||
|
|
||||||
public function wait($micro_seconds = null)
|
|
||||||
{
|
|
||||||
if (!is_null($micro_seconds))
|
|
||||||
{
|
|
||||||
usleep($micro_seconds);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
usleep(ApiTester::WAIT);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,26 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Inherited Methods
|
|
||||||
* @method void wantToTest($text)
|
|
||||||
* @method void wantTo($text)
|
|
||||||
* @method void execute($callable)
|
|
||||||
* @method void expectTo($prediction)
|
|
||||||
* @method void expect($prediction)
|
|
||||||
* @method void amGoingTo($argumentation)
|
|
||||||
* @method void am($role)
|
|
||||||
* @method void lookForwardTo($achieveValue)
|
|
||||||
* @method void comment($description)
|
|
||||||
* @method \Codeception\Lib\Friend haveFriend($name, $actorClass = NULL)
|
|
||||||
*
|
|
||||||
* @SuppressWarnings(PHPMD)
|
|
||||||
*/
|
|
||||||
class FunctionalTester extends \Codeception\Actor
|
|
||||||
{
|
|
||||||
use _generated\FunctionalTesterActions;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Define custom actions here
|
|
||||||
*/
|
|
||||||
}
|
|
||||||
@@ -1,25 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Inherited Methods
|
|
||||||
* @method void wantToTest($text)
|
|
||||||
* @method void wantTo($text)
|
|
||||||
* @method void execute($callable)
|
|
||||||
* @method void expectTo($prediction)
|
|
||||||
* @method void expect($prediction)
|
|
||||||
* @method void amGoingTo($argumentation)
|
|
||||||
* @method void am($role)
|
|
||||||
* @method void lookForwardTo($achieveValue)
|
|
||||||
* @method void comment($description)
|
|
||||||
* @method \Codeception\Lib\Friend haveFriend($name, $actorClass = NULL)
|
|
||||||
*
|
|
||||||
* @SuppressWarnings(PHPMD)
|
|
||||||
*/
|
|
||||||
class UnitTester extends \Codeception\Actor
|
|
||||||
{
|
|
||||||
use _generated\UnitTesterActions;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Define custom actions here
|
|
||||||
*/
|
|
||||||
}
|
|
||||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -1,204 +0,0 @@
|
|||||||
<?php //[STAMP] e88575298465f35c4ba48944693fdc61
|
|
||||||
namespace _generated;
|
|
||||||
|
|
||||||
// This class was automatically generated by build task
|
|
||||||
// You should not change it manually as it will be overwritten on next build
|
|
||||||
// @codingStandardsIgnoreFile
|
|
||||||
|
|
||||||
use Codeception\Module\Db;
|
|
||||||
|
|
||||||
trait FunctionalTesterActions
|
|
||||||
{
|
|
||||||
/**
|
|
||||||
* @return \Codeception\Scenario
|
|
||||||
*/
|
|
||||||
abstract protected function getScenario();
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* [!] Method is generated. Documentation taken from corresponding module.
|
|
||||||
*
|
|
||||||
* Inserts an SQL record into a database. This record will be erased after the test.
|
|
||||||
*
|
|
||||||
* ``` php
|
|
||||||
* <?php
|
|
||||||
* $I->haveInDatabase('users', array('name' => 'miles', 'email' => '[email protected]'));
|
|
||||||
* ?>
|
|
||||||
* ```
|
|
||||||
*
|
|
||||||
* @param string $table
|
|
||||||
* @param array $data
|
|
||||||
*
|
|
||||||
* @return integer $id
|
|
||||||
* @see \Codeception\Module\Db::haveInDatabase()
|
|
||||||
*/
|
|
||||||
public function haveInDatabase($table, $data) {
|
|
||||||
return $this->getScenario()->runStep(new \Codeception\Step\Action('haveInDatabase', func_get_args()));
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* [!] Method is generated. Documentation taken from corresponding module.
|
|
||||||
*
|
|
||||||
* Asserts that a row with the given column values exists.
|
|
||||||
* Provide table name and column values.
|
|
||||||
*
|
|
||||||
* ``` php
|
|
||||||
* <?php
|
|
||||||
* $I->seeInDatabase('users', array('name' => 'Davert', 'email' => '[email protected]'));
|
|
||||||
* ```
|
|
||||||
* Fails if no such user found.
|
|
||||||
*
|
|
||||||
* @param string $table
|
|
||||||
* @param array $criteria
|
|
||||||
* Conditional Assertion: Test won't be stopped on fail
|
|
||||||
* @see \Codeception\Module\Db::seeInDatabase()
|
|
||||||
*/
|
|
||||||
public function canSeeInDatabase($table, $criteria = null) {
|
|
||||||
return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeInDatabase', func_get_args()));
|
|
||||||
}
|
|
||||||
/**
|
|
||||||
* [!] Method is generated. Documentation taken from corresponding module.
|
|
||||||
*
|
|
||||||
* Asserts that a row with the given column values exists.
|
|
||||||
* Provide table name and column values.
|
|
||||||
*
|
|
||||||
* ``` php
|
|
||||||
* <?php
|
|
||||||
* $I->seeInDatabase('users', array('name' => 'Davert', 'email' => '[email protected]'));
|
|
||||||
* ```
|
|
||||||
* Fails if no such user found.
|
|
||||||
*
|
|
||||||
* @param string $table
|
|
||||||
* @param array $criteria
|
|
||||||
* @see \Codeception\Module\Db::seeInDatabase()
|
|
||||||
*/
|
|
||||||
public function seeInDatabase($table, $criteria = null) {
|
|
||||||
return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeInDatabase', func_get_args()));
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* [!] Method is generated. Documentation taken from corresponding module.
|
|
||||||
*
|
|
||||||
* Asserts that the given number of records were found in the database.
|
|
||||||
*
|
|
||||||
* ``` php
|
|
||||||
* <?php
|
|
||||||
* $I->seeNumRecords(1, 'users', ['name' => 'davert'])
|
|
||||||
* ?>
|
|
||||||
* ```
|
|
||||||
*
|
|
||||||
* @param int $expectedNumber Expected number
|
|
||||||
* @param string $table Table name
|
|
||||||
* @param array $criteria Search criteria [Optional]
|
|
||||||
* Conditional Assertion: Test won't be stopped on fail
|
|
||||||
* @see \Codeception\Module\Db::seeNumRecords()
|
|
||||||
*/
|
|
||||||
public function canSeeNumRecords($expectedNumber, $table, $criteria = null) {
|
|
||||||
return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeNumRecords', func_get_args()));
|
|
||||||
}
|
|
||||||
/**
|
|
||||||
* [!] Method is generated. Documentation taken from corresponding module.
|
|
||||||
*
|
|
||||||
* Asserts that the given number of records were found in the database.
|
|
||||||
*
|
|
||||||
* ``` php
|
|
||||||
* <?php
|
|
||||||
* $I->seeNumRecords(1, 'users', ['name' => 'davert'])
|
|
||||||
* ?>
|
|
||||||
* ```
|
|
||||||
*
|
|
||||||
* @param int $expectedNumber Expected number
|
|
||||||
* @param string $table Table name
|
|
||||||
* @param array $criteria Search criteria [Optional]
|
|
||||||
* @see \Codeception\Module\Db::seeNumRecords()
|
|
||||||
*/
|
|
||||||
public function seeNumRecords($expectedNumber, $table, $criteria = null) {
|
|
||||||
return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeNumRecords', func_get_args()));
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* [!] Method is generated. Documentation taken from corresponding module.
|
|
||||||
*
|
|
||||||
* Effect is opposite to ->seeInDatabase
|
|
||||||
*
|
|
||||||
* Asserts that there is no record with the given column values in a database.
|
|
||||||
* Provide table name and column values.
|
|
||||||
*
|
|
||||||
* ``` php
|
|
||||||
* <?php
|
|
||||||
* $I->dontSeeInDatabase('users', array('name' => 'Davert', 'email' => '[email protected]'));
|
|
||||||
* ```
|
|
||||||
* Fails if such user was found.
|
|
||||||
*
|
|
||||||
* @param string $table
|
|
||||||
* @param array $criteria
|
|
||||||
* Conditional Assertion: Test won't be stopped on fail
|
|
||||||
* @see \Codeception\Module\Db::dontSeeInDatabase()
|
|
||||||
*/
|
|
||||||
public function cantSeeInDatabase($table, $criteria = null) {
|
|
||||||
return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeInDatabase', func_get_args()));
|
|
||||||
}
|
|
||||||
/**
|
|
||||||
* [!] Method is generated. Documentation taken from corresponding module.
|
|
||||||
*
|
|
||||||
* Effect is opposite to ->seeInDatabase
|
|
||||||
*
|
|
||||||
* Asserts that there is no record with the given column values in a database.
|
|
||||||
* Provide table name and column values.
|
|
||||||
*
|
|
||||||
* ``` php
|
|
||||||
* <?php
|
|
||||||
* $I->dontSeeInDatabase('users', array('name' => 'Davert', 'email' => '[email protected]'));
|
|
||||||
* ```
|
|
||||||
* Fails if such user was found.
|
|
||||||
*
|
|
||||||
* @param string $table
|
|
||||||
* @param array $criteria
|
|
||||||
* @see \Codeception\Module\Db::dontSeeInDatabase()
|
|
||||||
*/
|
|
||||||
public function dontSeeInDatabase($table, $criteria = null) {
|
|
||||||
return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeInDatabase', func_get_args()));
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* [!] Method is generated. Documentation taken from corresponding module.
|
|
||||||
*
|
|
||||||
* Fetches a single column value from a database.
|
|
||||||
* Provide table name, desired column and criteria.
|
|
||||||
*
|
|
||||||
* ``` php
|
|
||||||
* <?php
|
|
||||||
* $mail = $I->grabFromDatabase('users', 'email', array('name' => 'Davert'));
|
|
||||||
* ```
|
|
||||||
*
|
|
||||||
* @param string $table
|
|
||||||
* @param string $column
|
|
||||||
* @param array $criteria
|
|
||||||
*
|
|
||||||
* @return mixed
|
|
||||||
* @see \Codeception\Module\Db::grabFromDatabase()
|
|
||||||
*/
|
|
||||||
public function grabFromDatabase($table, $column, $criteria = null) {
|
|
||||||
return $this->getScenario()->runStep(new \Codeception\Step\Action('grabFromDatabase', func_get_args()));
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* [!] Method is generated. Documentation taken from corresponding module.
|
|
||||||
*
|
|
||||||
* Returns the number of rows in a database
|
|
||||||
*
|
|
||||||
* @param string $table Table name
|
|
||||||
* @param array $criteria Search criteria [Optional]
|
|
||||||
*
|
|
||||||
* @return int
|
|
||||||
* @see \Codeception\Module\Db::grabNumRecords()
|
|
||||||
*/
|
|
||||||
public function grabNumRecords($table, $criteria = null) {
|
|
||||||
return $this->getScenario()->runStep(new \Codeception\Step\Action('grabNumRecords', func_get_args()));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,204 +0,0 @@
|
|||||||
<?php //[STAMP] e88575298465f35c4ba48944693fdc61
|
|
||||||
namespace _generated;
|
|
||||||
|
|
||||||
// This class was automatically generated by build task
|
|
||||||
// You should not change it manually as it will be overwritten on next build
|
|
||||||
// @codingStandardsIgnoreFile
|
|
||||||
|
|
||||||
use Codeception\Module\Db;
|
|
||||||
|
|
||||||
trait UnitTesterActions
|
|
||||||
{
|
|
||||||
/**
|
|
||||||
* @return \Codeception\Scenario
|
|
||||||
*/
|
|
||||||
abstract protected function getScenario();
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* [!] Method is generated. Documentation taken from corresponding module.
|
|
||||||
*
|
|
||||||
* Inserts an SQL record into a database. This record will be erased after the test.
|
|
||||||
*
|
|
||||||
* ``` php
|
|
||||||
* <?php
|
|
||||||
* $I->haveInDatabase('users', array('name' => 'miles', 'email' => '[email protected]'));
|
|
||||||
* ?>
|
|
||||||
* ```
|
|
||||||
*
|
|
||||||
* @param string $table
|
|
||||||
* @param array $data
|
|
||||||
*
|
|
||||||
* @return integer $id
|
|
||||||
* @see \Codeception\Module\Db::haveInDatabase()
|
|
||||||
*/
|
|
||||||
public function haveInDatabase($table, $data) {
|
|
||||||
return $this->getScenario()->runStep(new \Codeception\Step\Action('haveInDatabase', func_get_args()));
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* [!] Method is generated. Documentation taken from corresponding module.
|
|
||||||
*
|
|
||||||
* Asserts that a row with the given column values exists.
|
|
||||||
* Provide table name and column values.
|
|
||||||
*
|
|
||||||
* ``` php
|
|
||||||
* <?php
|
|
||||||
* $I->seeInDatabase('users', array('name' => 'Davert', 'email' => '[email protected]'));
|
|
||||||
* ```
|
|
||||||
* Fails if no such user found.
|
|
||||||
*
|
|
||||||
* @param string $table
|
|
||||||
* @param array $criteria
|
|
||||||
* Conditional Assertion: Test won't be stopped on fail
|
|
||||||
* @see \Codeception\Module\Db::seeInDatabase()
|
|
||||||
*/
|
|
||||||
public function canSeeInDatabase($table, $criteria = null) {
|
|
||||||
return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeInDatabase', func_get_args()));
|
|
||||||
}
|
|
||||||
/**
|
|
||||||
* [!] Method is generated. Documentation taken from corresponding module.
|
|
||||||
*
|
|
||||||
* Asserts that a row with the given column values exists.
|
|
||||||
* Provide table name and column values.
|
|
||||||
*
|
|
||||||
* ``` php
|
|
||||||
* <?php
|
|
||||||
* $I->seeInDatabase('users', array('name' => 'Davert', 'email' => '[email protected]'));
|
|
||||||
* ```
|
|
||||||
* Fails if no such user found.
|
|
||||||
*
|
|
||||||
* @param string $table
|
|
||||||
* @param array $criteria
|
|
||||||
* @see \Codeception\Module\Db::seeInDatabase()
|
|
||||||
*/
|
|
||||||
public function seeInDatabase($table, $criteria = null) {
|
|
||||||
return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeInDatabase', func_get_args()));
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* [!] Method is generated. Documentation taken from corresponding module.
|
|
||||||
*
|
|
||||||
* Asserts that the given number of records were found in the database.
|
|
||||||
*
|
|
||||||
* ``` php
|
|
||||||
* <?php
|
|
||||||
* $I->seeNumRecords(1, 'users', ['name' => 'davert'])
|
|
||||||
* ?>
|
|
||||||
* ```
|
|
||||||
*
|
|
||||||
* @param int $expectedNumber Expected number
|
|
||||||
* @param string $table Table name
|
|
||||||
* @param array $criteria Search criteria [Optional]
|
|
||||||
* Conditional Assertion: Test won't be stopped on fail
|
|
||||||
* @see \Codeception\Module\Db::seeNumRecords()
|
|
||||||
*/
|
|
||||||
public function canSeeNumRecords($expectedNumber, $table, $criteria = null) {
|
|
||||||
return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeNumRecords', func_get_args()));
|
|
||||||
}
|
|
||||||
/**
|
|
||||||
* [!] Method is generated. Documentation taken from corresponding module.
|
|
||||||
*
|
|
||||||
* Asserts that the given number of records were found in the database.
|
|
||||||
*
|
|
||||||
* ``` php
|
|
||||||
* <?php
|
|
||||||
* $I->seeNumRecords(1, 'users', ['name' => 'davert'])
|
|
||||||
* ?>
|
|
||||||
* ```
|
|
||||||
*
|
|
||||||
* @param int $expectedNumber Expected number
|
|
||||||
* @param string $table Table name
|
|
||||||
* @param array $criteria Search criteria [Optional]
|
|
||||||
* @see \Codeception\Module\Db::seeNumRecords()
|
|
||||||
*/
|
|
||||||
public function seeNumRecords($expectedNumber, $table, $criteria = null) {
|
|
||||||
return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeNumRecords', func_get_args()));
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* [!] Method is generated. Documentation taken from corresponding module.
|
|
||||||
*
|
|
||||||
* Effect is opposite to ->seeInDatabase
|
|
||||||
*
|
|
||||||
* Asserts that there is no record with the given column values in a database.
|
|
||||||
* Provide table name and column values.
|
|
||||||
*
|
|
||||||
* ``` php
|
|
||||||
* <?php
|
|
||||||
* $I->dontSeeInDatabase('users', array('name' => 'Davert', 'email' => '[email protected]'));
|
|
||||||
* ```
|
|
||||||
* Fails if such user was found.
|
|
||||||
*
|
|
||||||
* @param string $table
|
|
||||||
* @param array $criteria
|
|
||||||
* Conditional Assertion: Test won't be stopped on fail
|
|
||||||
* @see \Codeception\Module\Db::dontSeeInDatabase()
|
|
||||||
*/
|
|
||||||
public function cantSeeInDatabase($table, $criteria = null) {
|
|
||||||
return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeInDatabase', func_get_args()));
|
|
||||||
}
|
|
||||||
/**
|
|
||||||
* [!] Method is generated. Documentation taken from corresponding module.
|
|
||||||
*
|
|
||||||
* Effect is opposite to ->seeInDatabase
|
|
||||||
*
|
|
||||||
* Asserts that there is no record with the given column values in a database.
|
|
||||||
* Provide table name and column values.
|
|
||||||
*
|
|
||||||
* ``` php
|
|
||||||
* <?php
|
|
||||||
* $I->dontSeeInDatabase('users', array('name' => 'Davert', 'email' => '[email protected]'));
|
|
||||||
* ```
|
|
||||||
* Fails if such user was found.
|
|
||||||
*
|
|
||||||
* @param string $table
|
|
||||||
* @param array $criteria
|
|
||||||
* @see \Codeception\Module\Db::dontSeeInDatabase()
|
|
||||||
*/
|
|
||||||
public function dontSeeInDatabase($table, $criteria = null) {
|
|
||||||
return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeInDatabase', func_get_args()));
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* [!] Method is generated. Documentation taken from corresponding module.
|
|
||||||
*
|
|
||||||
* Fetches a single column value from a database.
|
|
||||||
* Provide table name, desired column and criteria.
|
|
||||||
*
|
|
||||||
* ``` php
|
|
||||||
* <?php
|
|
||||||
* $mail = $I->grabFromDatabase('users', 'email', array('name' => 'Davert'));
|
|
||||||
* ```
|
|
||||||
*
|
|
||||||
* @param string $table
|
|
||||||
* @param string $column
|
|
||||||
* @param array $criteria
|
|
||||||
*
|
|
||||||
* @return mixed
|
|
||||||
* @see \Codeception\Module\Db::grabFromDatabase()
|
|
||||||
*/
|
|
||||||
public function grabFromDatabase($table, $column, $criteria = null) {
|
|
||||||
return $this->getScenario()->runStep(new \Codeception\Step\Action('grabFromDatabase', func_get_args()));
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* [!] Method is generated. Documentation taken from corresponding module.
|
|
||||||
*
|
|
||||||
* Returns the number of rows in a database
|
|
||||||
*
|
|
||||||
* @param string $table Table name
|
|
||||||
* @param array $criteria Search criteria [Optional]
|
|
||||||
*
|
|
||||||
* @return int
|
|
||||||
* @see \Codeception\Module\Db::grabNumRecords()
|
|
||||||
*/
|
|
||||||
public function grabNumRecords($table, $criteria = null) {
|
|
||||||
return $this->getScenario()->runStep(new \Codeception\Step\Action('grabNumRecords', func_get_args()));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,27 +0,0 @@
|
|||||||
actor: Tester
|
|
||||||
paths:
|
|
||||||
tests: tests
|
|
||||||
log: _output
|
|
||||||
data: _data
|
|
||||||
helpers: _support
|
|
||||||
settings:
|
|
||||||
bootstrap: _bootstrap.php
|
|
||||||
colors: true
|
|
||||||
memory_limit: 1024M
|
|
||||||
modules:
|
|
||||||
enabled:
|
|
||||||
- Db:
|
|
||||||
dsn: 'pgsql:host=localhost;port=5432;dbname=fhctest'
|
|
||||||
user: 'fhcomplete'
|
|
||||||
password: 'fhcomplete'
|
|
||||||
dump: _data/dump.sql
|
|
||||||
populate: true
|
|
||||||
cleanup: false
|
|
||||||
reconnect: false
|
|
||||||
coverage:
|
|
||||||
enabled: true
|
|
||||||
include:
|
|
||||||
- application/*
|
|
||||||
exclude:
|
|
||||||
- application/cache/*
|
|
||||||
- application/logs/*
|
|
||||||
@@ -1,21 +0,0 @@
|
|||||||
# Codeception Test Suite Configuration
|
|
||||||
|
|
||||||
# suite for acceptance tests.
|
|
||||||
# perform tests in browser using the WebDriver or PhpBrowser.
|
|
||||||
# If you need both WebDriver and PHPBrowser tests - create a separate suite.
|
|
||||||
|
|
||||||
class_name: AcceptanceTester
|
|
||||||
modules:
|
|
||||||
enabled:
|
|
||||||
- Db
|
|
||||||
- PhpBrowser:
|
|
||||||
url: 'http://admin:[email protected]/build/'
|
|
||||||
config:
|
|
||||||
Db:
|
|
||||||
dsn: 'pgsql:host=localhost;port=5432;dbname=fhctest'
|
|
||||||
user: 'fhcomplete'
|
|
||||||
password: 'fhcomplete'
|
|
||||||
dump: _data/dump.sql
|
|
||||||
populate: true
|
|
||||||
cleanup: false
|
|
||||||
reconnect: false
|
|
||||||
@@ -1,6 +0,0 @@
|
|||||||
<?php
|
|
||||||
$I = new AcceptanceTester($scenario);
|
|
||||||
$I->wantTo('CIS Startseite Testen');
|
|
||||||
//$I->amOnPage('/cis/index.html');
|
|
||||||
//$I->see('Powered by FH Complete');
|
|
||||||
?>
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
$I = new AcceptanceTester($scenario);
|
|
||||||
$I->wantTo('Test the Search-Feature of VileSci');
|
|
||||||
$I->amOnPage('/vilesci/personen/suche.php');
|
|
||||||
$I->lookForwardTo('Personensuche');
|
|
||||||
$I->seeElement('input[name="searchstr"]');
|
|
||||||
$I->seeElement('input[type=submit][value=Suchen]');
|
|
||||||
$I->fillField('searchstr', 'Vicenta');
|
|
||||||
$I->click('Suchen');
|
|
||||||
$I->see('McKenzie');
|
|
||||||
@@ -1,26 +0,0 @@
|
|||||||
<?php
|
|
||||||
$I = new AcceptanceTester($scenario);
|
|
||||||
$I->wantTo('test the Startpage of VileSci');
|
|
||||||
|
|
||||||
$I->wantTo('test this over vilesci/index.php');
|
|
||||||
$I->amOnPage('/vilesci/index.php');
|
|
||||||
$I->See('This application works only with');
|
|
||||||
$I->seeElement('#frameset-vilesci');
|
|
||||||
|
|
||||||
$I->wantTo('and now over index.ci.php');
|
|
||||||
$I->amOnPage('/index.ci.php');
|
|
||||||
$I->See('This application works only with');
|
|
||||||
$I->seeElement('#frameset-vilesci');
|
|
||||||
|
|
||||||
$I->wantTo('test the top menu');
|
|
||||||
$I->amOnPage('/vilesci/top.php');
|
|
||||||
$I->seeElement('.logo');
|
|
||||||
|
|
||||||
$I->wantTo('test the left nav-frame');
|
|
||||||
$I->amOnPage('/vilesci/left.php');
|
|
||||||
$I->seeElement('.left_nav');
|
|
||||||
|
|
||||||
$I->wantTo('test the main-frame');
|
|
||||||
$I->amOnPage('/vilesci/main.php');
|
|
||||||
$I->seeElement('img');
|
|
||||||
?>
|
|
||||||
@@ -1,2 +0,0 @@
|
|||||||
<?php
|
|
||||||
// Here you can initialize variables that will be available to your tests
|
|
||||||
@@ -1,20 +0,0 @@
|
|||||||
class_name: ApiTester
|
|
||||||
modules:
|
|
||||||
enabled:
|
|
||||||
- Db
|
|
||||||
- REST:
|
|
||||||
# API URL
|
|
||||||
url: 'http://admin:[email protected]/build/index.ci.php/api/'
|
|
||||||
# Can also be a framework module name
|
|
||||||
depends: PhpBrowser
|
|
||||||
# Limits PhpBrowser to JSON or XML
|
|
||||||
part: Json
|
|
||||||
config:
|
|
||||||
Db:
|
|
||||||
dsn: 'pgsql:host=localhost;port=5432;dbname=fhctest'
|
|
||||||
user: 'fhcomplete'
|
|
||||||
password: 'fhcomplete'
|
|
||||||
dump: _data/dump.sql
|
|
||||||
populate: true
|
|
||||||
cleanup: false
|
|
||||||
reconnect: false
|
|
||||||
@@ -1,2 +0,0 @@
|
|||||||
<?php
|
|
||||||
// Here you can initialize variables that will be available to your tests
|
|
||||||
@@ -1,178 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Recursively finds all files in the given folder
|
|
||||||
*/
|
|
||||||
function lstFiles($dir, $lst = null)
|
|
||||||
{
|
|
||||||
$retLst = array();
|
|
||||||
|
|
||||||
if ($lst == null)
|
|
||||||
$lst = scandir($dir);
|
|
||||||
|
|
||||||
$lst = array_diff($lst, array('..', '.'));
|
|
||||||
|
|
||||||
foreach ($lst as $el)
|
|
||||||
{
|
|
||||||
if (is_dir($dir.'/'.$el))
|
|
||||||
{
|
|
||||||
$retLst = array_merge($retLst, lstFiles($dir.'/'.$el, scandir($dir.'/'.$el)));
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
array_push($retLst, $dir.'/'.$el);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return $retLst;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Get a list of every file present in the given folder
|
|
||||||
$lstFiles = lstFiles('../../../../application/controllers/api/v1');
|
|
||||||
|
|
||||||
// Automatically detects the line ending character
|
|
||||||
ini_set('auto_detect_line_endings', true);
|
|
||||||
// Gets the template of the header of the test file
|
|
||||||
if (($fileTplHead = file_get_contents('./template_head.tpl')) === false)
|
|
||||||
die('Problems loading template_head.tpl');
|
|
||||||
// Gets the template of the body of the test file
|
|
||||||
if (($fileTplCall = file_get_contents('./template_call.tpl')) === false)
|
|
||||||
die('Problems loading template_call.tpl');
|
|
||||||
|
|
||||||
// Loops the list of files
|
|
||||||
foreach($lstFiles as $file)
|
|
||||||
{
|
|
||||||
// Open the file for reading
|
|
||||||
if (($fileHandle = fopen($file, 'r')) !== false)
|
|
||||||
{
|
|
||||||
$name = ''; // Name of the test
|
|
||||||
$functions = array(); // List of functions
|
|
||||||
$functionsCounter = -1; // Functions counter
|
|
||||||
|
|
||||||
// Reads from the file line by line
|
|
||||||
while (($line = fgets($fileHandle, 4096)) !== false)
|
|
||||||
{
|
|
||||||
// Drops the spaces at the beginning and at the and of the line
|
|
||||||
$line = trim($line);
|
|
||||||
|
|
||||||
// If it is the line that declare the class
|
|
||||||
if (strpos($line, 'class') !== false)
|
|
||||||
{
|
|
||||||
$name = explode(' ', $line)[1];
|
|
||||||
}
|
|
||||||
|
|
||||||
// If it is a line that declare a function
|
|
||||||
if (strpos($line, 'public function get') !== false)
|
|
||||||
{
|
|
||||||
$functionsCounter++;
|
|
||||||
$functions[$functionsCounter] = array();
|
|
||||||
$functions[$functionsCounter]['name'] = trim(preg_replace('/^get/i', ' ', explode(' ', $line)[2]));
|
|
||||||
$functions[$functionsCounter]['name'] = trim(str_replace('()', ' ', $functions[$functionsCounter]['name']));
|
|
||||||
$functions[$functionsCounter]['parameters'] = array();
|
|
||||||
}
|
|
||||||
|
|
||||||
// If it is a line that get a parameter
|
|
||||||
if (strpos($line, 'this->get') !== false)
|
|
||||||
{
|
|
||||||
$parameters = explode('\'', $line);
|
|
||||||
if (count($parameters) >= 2)
|
|
||||||
{
|
|
||||||
$functions[$functionsCounter]['parameters'][] = $parameters[1];
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
$parameters = explode('"', $line);
|
|
||||||
if (count($parameters) >= 2)
|
|
||||||
{
|
|
||||||
$functions[$functionsCounter]['parameters'][] = $parameters[1];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fclose($fileHandle); // Closing the file pointer is always a good thing
|
|
||||||
|
|
||||||
// Gets the path of the api
|
|
||||||
$apiPath = trim(str_replace('../../../../application/controllers/api/', ' ', $file));
|
|
||||||
$apiPath = substr($apiPath, 0, strrpos($apiPath, '/') + 1);
|
|
||||||
// Prefix of the test file name given by the parent folder
|
|
||||||
$namePrefix = trim(str_replace('v1/', ' ', $apiPath));
|
|
||||||
$namePrefix = ucfirst(trim(str_replace('/', ' ', $namePrefix)));
|
|
||||||
|
|
||||||
// If if is not a fake
|
|
||||||
if (trim($name) != '')
|
|
||||||
{
|
|
||||||
// Where to create the test files
|
|
||||||
$testDir = './v1/';
|
|
||||||
// If the test file is not already present
|
|
||||||
if (!file_exists($testDir.$namePrefix.$name.'Cept.php'))
|
|
||||||
{
|
|
||||||
// Create and open the test file for writing
|
|
||||||
if (($fileTestHandle = fopen($testDir.$namePrefix.$name.'Cept.php', 'w')) !== false)
|
|
||||||
{
|
|
||||||
// Lst of function to place in the header
|
|
||||||
$strLstFunctions = '';
|
|
||||||
for($i = 0; $i < count($functions); $i++)
|
|
||||||
{
|
|
||||||
$function = $functions[$i];
|
|
||||||
if ($i == 0)
|
|
||||||
{
|
|
||||||
$strLstFunctions .= $apiPath.$name.'/'.': ';
|
|
||||||
}
|
|
||||||
|
|
||||||
$strLstFunctions .= $function['name'];
|
|
||||||
|
|
||||||
if ($i < count($functions) - 1)
|
|
||||||
{
|
|
||||||
$strLstFunctions .= ' ';
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Create the test file header using the template
|
|
||||||
$strToWrite = str_replace('_CALL_', $strLstFunctions, $fileTplHead);
|
|
||||||
// Writes the header into the test file
|
|
||||||
if (fwrite($fileTestHandle, $strToWrite."\n") === false)
|
|
||||||
{
|
|
||||||
echo 'Error!!!';
|
|
||||||
}
|
|
||||||
|
|
||||||
// For every function create a call
|
|
||||||
foreach($functions as $function)
|
|
||||||
{
|
|
||||||
// Gets a list of parameters
|
|
||||||
$strLstParameters = '';
|
|
||||||
for($i = 0; $i < count($function['parameters']); $i++)
|
|
||||||
{
|
|
||||||
$parameter = $function['parameters'][$i];
|
|
||||||
$strLstParameters .= '"'.$parameter.'" => "1"';
|
|
||||||
if ($i < count($function['parameters']) - 1)
|
|
||||||
{
|
|
||||||
$strLstParameters .= ", ";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
// Create the call using the template
|
|
||||||
$strToWrite = str_replace('_CALL_', $apiPath.$name.'/'.$function['name'], $fileTplCall);
|
|
||||||
$strToWrite = str_replace('_PARAMETERS_', $strLstParameters, $strToWrite);
|
|
||||||
// Write it into the test file
|
|
||||||
if (fwrite($fileTestHandle, $strToWrite."\n") === false)
|
|
||||||
{
|
|
||||||
echo 'Error!!!';
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fclose($fileTestHandle); // As usual
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
echo "Error opening file: ".$testDir.$name.'Cept.php'."\n";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
echo $testDir.$name."Cept.php is already present\n";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
?>
|
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
$I->sendGET("_CALL_", array(_PARAMETERS_));
|
|
||||||
$I->seeResponseCodeIs(200);
|
|
||||||
$I->seeResponseIsJson();
|
|
||||||
$I->seeResponseContainsJson(["error" => 0]);
|
|
||||||
$I->wait();
|
|
||||||
@@ -1,6 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
$I = new ApiTester($scenario);
|
|
||||||
$I->wantTo("Test API call _CALL_");
|
|
||||||
$I->amHttpAuthenticated("admin", "1q2w3");
|
|
||||||
$I->haveHttpHeader("FHC-API-KEY", "[email protected]");
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
$I = new ApiTester($scenario);
|
|
||||||
$I->wantTo("Test API call v1/accounting/Aufteilung/: Aufteilung");
|
|
||||||
$I->amHttpAuthenticated("admin", "1q2w3");
|
|
||||||
$I->haveHttpHeader("FHC-API-KEY", "[email protected]");
|
|
||||||
$I->sendGET("v1/accounting/Aufteilung/Aufteilung", array("aufteilung_id" => "1"));
|
|
||||||
$I->seeResponseCodeIs(200);
|
|
||||||
$I->seeResponseIsJson();
|
|
||||||
$I->seeResponseContainsJson(["error" => 0]);
|
|
||||||
$I->wait();
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
$I = new ApiTester($scenario);
|
|
||||||
$I->wantTo("Test API call v1/accounting/Bestelldetail/: Bestelldetail");
|
|
||||||
$I->amHttpAuthenticated("admin", "1q2w3");
|
|
||||||
$I->haveHttpHeader("FHC-API-KEY", "[email protected]");
|
|
||||||
$I->sendGET("v1/accounting/Bestelldetail/Bestelldetail", array("bestelldetail_id" => "1"));
|
|
||||||
$I->seeResponseCodeIs(200);
|
|
||||||
$I->seeResponseIsJson();
|
|
||||||
$I->seeResponseContainsJson(["error" => 0]);
|
|
||||||
$I->wait();
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
$I = new ApiTester($scenario);
|
|
||||||
$I->wantTo("Test API call v1/accounting/Bestelldetailtag/: Bestelldetailtag");
|
|
||||||
$I->amHttpAuthenticated("admin", "1q2w3");
|
|
||||||
$I->haveHttpHeader("FHC-API-KEY", "[email protected]");
|
|
||||||
$I->sendGET("v1/accounting/Bestelldetailtag/Bestelldetailtag", array("bestelldetail_id" => "1", "tag" => "1"));
|
|
||||||
$I->seeResponseCodeIs(200);
|
|
||||||
$I->seeResponseIsJson();
|
|
||||||
$I->seeResponseContainsJson(["error" => 0]);
|
|
||||||
$I->wait();
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
$I = new ApiTester($scenario);
|
|
||||||
$I->wantTo("Test API call v1/accounting/Bestellstatus/: Bestellstatus");
|
|
||||||
$I->amHttpAuthenticated("admin", "1q2w3");
|
|
||||||
$I->haveHttpHeader("FHC-API-KEY", "[email protected]");
|
|
||||||
$I->sendGET("v1/accounting/Bestellstatus/Bestellstatus", array("bestellstatus_kurzbz" => "1"));
|
|
||||||
$I->seeResponseCodeIs(200);
|
|
||||||
$I->seeResponseIsJson();
|
|
||||||
$I->seeResponseContainsJson(["error" => 0]);
|
|
||||||
$I->wait();
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
$I = new ApiTester($scenario);
|
|
||||||
$I->wantTo("Test API call v1/accounting/Bestellung/: Bestellung");
|
|
||||||
$I->amHttpAuthenticated("admin", "1q2w3");
|
|
||||||
$I->haveHttpHeader("FHC-API-KEY", "[email protected]");
|
|
||||||
$I->sendGET("v1/accounting/Bestellung/Bestellung", array("bestellung_id" => "1"));
|
|
||||||
$I->seeResponseCodeIs(200);
|
|
||||||
$I->seeResponseIsJson();
|
|
||||||
$I->seeResponseContainsJson(["error" => 0]);
|
|
||||||
$I->wait();
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
$I = new ApiTester($scenario);
|
|
||||||
$I->wantTo("Test API call v1/accounting/Bestellungtag/: Bestellungtag");
|
|
||||||
$I->amHttpAuthenticated("admin", "1q2w3");
|
|
||||||
$I->haveHttpHeader("FHC-API-KEY", "[email protected]");
|
|
||||||
$I->sendGET("v1/accounting/Bestellungtag/Bestellungtag", array("bestellung_id" => "1", "tag" => "1"));
|
|
||||||
$I->seeResponseCodeIs(200);
|
|
||||||
$I->seeResponseIsJson();
|
|
||||||
$I->seeResponseContainsJson(["error" => 0]);
|
|
||||||
$I->wait();
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
$I = new ApiTester($scenario);
|
|
||||||
$I->wantTo("Test API call v1/accounting/Buchung/: Buchung");
|
|
||||||
$I->amHttpAuthenticated("admin", "1q2w3");
|
|
||||||
$I->haveHttpHeader("FHC-API-KEY", "[email protected]");
|
|
||||||
$I->sendGET("v1/accounting/Buchung/Buchung", array("buchung_id" => "1"));
|
|
||||||
$I->seeResponseCodeIs(200);
|
|
||||||
$I->seeResponseIsJson();
|
|
||||||
$I->seeResponseContainsJson(["error" => 0]);
|
|
||||||
$I->wait();
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
$I = new ApiTester($scenario);
|
|
||||||
$I->wantTo("Test API call v1/accounting/Buchungstyp/: Buchungstyp");
|
|
||||||
$I->amHttpAuthenticated("admin", "1q2w3");
|
|
||||||
$I->haveHttpHeader("FHC-API-KEY", "[email protected]");
|
|
||||||
$I->sendGET("v1/accounting/Buchungstyp/Buchungstyp", array("buchungstyp_kurzbz" => "1"));
|
|
||||||
$I->seeResponseCodeIs(200);
|
|
||||||
$I->seeResponseIsJson();
|
|
||||||
$I->seeResponseContainsJson(["error" => 0]);
|
|
||||||
$I->wait();
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
$I = new ApiTester($scenario);
|
|
||||||
$I->wantTo("Test API call v1/accounting/Budget/: Budget");
|
|
||||||
$I->amHttpAuthenticated("admin", "1q2w3");
|
|
||||||
$I->haveHttpHeader("FHC-API-KEY", "[email protected]");
|
|
||||||
$I->sendGET("v1/accounting/Budget/Budget", array("kostenstelle_id" => "1", "geschaeftsjahr_kurzbz" => "1"));
|
|
||||||
$I->seeResponseCodeIs(200);
|
|
||||||
$I->seeResponseIsJson();
|
|
||||||
$I->seeResponseContainsJson(["error" => 0]);
|
|
||||||
$I->wait();
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
$I = new ApiTester($scenario);
|
|
||||||
$I->wantTo("Test API call v1/accounting/Konto/: Konto");
|
|
||||||
$I->amHttpAuthenticated("admin", "1q2w3");
|
|
||||||
$I->haveHttpHeader("FHC-API-KEY", "[email protected]");
|
|
||||||
$I->sendGET("v1/accounting/Konto/Konto", array("konto_id" => "1"));
|
|
||||||
$I->seeResponseCodeIs(200);
|
|
||||||
$I->seeResponseIsJson();
|
|
||||||
$I->seeResponseContainsJson(["error" => 0]);
|
|
||||||
$I->wait();
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
$I = new ApiTester($scenario);
|
|
||||||
$I->wantTo("Test API call v1/accounting/Kostenstelle/: Kostenstelle");
|
|
||||||
$I->amHttpAuthenticated("admin", "1q2w3");
|
|
||||||
$I->haveHttpHeader("FHC-API-KEY", "[email protected]");
|
|
||||||
$I->sendGET("v1/accounting/Kostenstelle/Kostenstelle", array("kostenstelle_id" => "1"));
|
|
||||||
$I->seeResponseCodeIs(200);
|
|
||||||
$I->seeResponseIsJson();
|
|
||||||
$I->seeResponseContainsJson(["error" => 0]);
|
|
||||||
$I->wait();
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
$I = new ApiTester($scenario);
|
|
||||||
$I->wantTo("Test API call v1/accounting/Rechnung/: Rechnung");
|
|
||||||
$I->amHttpAuthenticated("admin", "1q2w3");
|
|
||||||
$I->haveHttpHeader("FHC-API-KEY", "[email protected]");
|
|
||||||
$I->sendGET("v1/accounting/Rechnung/Rechnung", array("rechnung_id" => "1"));
|
|
||||||
$I->seeResponseCodeIs(200);
|
|
||||||
$I->seeResponseIsJson();
|
|
||||||
$I->seeResponseContainsJson(["error" => 0]);
|
|
||||||
$I->wait();
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
$I = new ApiTester($scenario);
|
|
||||||
$I->wantTo("Test API call v1/accounting/Rechnungsbetrag/: Rechnungsbetrag");
|
|
||||||
$I->amHttpAuthenticated("admin", "1q2w3");
|
|
||||||
$I->haveHttpHeader("FHC-API-KEY", "[email protected]");
|
|
||||||
$I->sendGET("v1/accounting/Rechnungsbetrag/Rechnungsbetrag", array("rechnungsbetrag_id" => "1"));
|
|
||||||
$I->seeResponseCodeIs(200);
|
|
||||||
$I->seeResponseIsJson();
|
|
||||||
$I->seeResponseContainsJson(["error" => 0]);
|
|
||||||
$I->wait();
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
$I = new ApiTester($scenario);
|
|
||||||
$I->wantTo("Test API call v1/accounting/Rechnungstyp/: Rechnungstyp");
|
|
||||||
$I->amHttpAuthenticated("admin", "1q2w3");
|
|
||||||
$I->haveHttpHeader("FHC-API-KEY", "[email protected]");
|
|
||||||
$I->sendGET("v1/accounting/Rechnungstyp/Rechnungstyp", array("rechnungstyp_kurzbz" => "1"));
|
|
||||||
$I->seeResponseCodeIs(200);
|
|
||||||
$I->seeResponseIsJson();
|
|
||||||
$I->seeResponseContainsJson(["error" => 0]);
|
|
||||||
$I->wait();
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
$I = new ApiTester($scenario);
|
|
||||||
$I->wantTo("Test API call v1/accounting/Vertrag/: Vertrag");
|
|
||||||
$I->amHttpAuthenticated("admin", "1q2w3");
|
|
||||||
$I->haveHttpHeader("FHC-API-KEY", "[email protected]");
|
|
||||||
$I->sendGET("v1/accounting/Vertrag/Vertrag", array("vertrag_id" => "1"));
|
|
||||||
$I->seeResponseCodeIs(200);
|
|
||||||
$I->seeResponseIsJson();
|
|
||||||
$I->seeResponseContainsJson(["error" => 0]);
|
|
||||||
$I->wait();
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
$I = new ApiTester($scenario);
|
|
||||||
$I->wantTo("Test API call v1/accounting/Vertragsstatus/: Vertragsstatus");
|
|
||||||
$I->amHttpAuthenticated("admin", "1q2w3");
|
|
||||||
$I->haveHttpHeader("FHC-API-KEY", "[email protected]");
|
|
||||||
$I->sendGET("v1/accounting/Vertragsstatus/Vertragsstatus", array("vertragsstatus_kurzbz" => "1"));
|
|
||||||
$I->seeResponseCodeIs(200);
|
|
||||||
$I->seeResponseIsJson();
|
|
||||||
$I->seeResponseContainsJson(["error" => 0]);
|
|
||||||
$I->wait();
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
$I = new ApiTester($scenario);
|
|
||||||
$I->wantTo("Test API call v1/accounting/Vertragstyp/: Vertragstyp");
|
|
||||||
$I->amHttpAuthenticated("admin", "1q2w3");
|
|
||||||
$I->haveHttpHeader("FHC-API-KEY", "[email protected]");
|
|
||||||
$I->sendGET("v1/accounting/Vertragstyp/Vertragstyp", array("vertragstyp_kurzbz" => "1"));
|
|
||||||
$I->seeResponseCodeIs(200);
|
|
||||||
$I->seeResponseIsJson();
|
|
||||||
$I->seeResponseContainsJson(["error" => 0]);
|
|
||||||
$I->wait();
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
$I = new ApiTester($scenario);
|
|
||||||
$I->wantTo("Test API call v1/accounting/Zahlungstyp/: Zahlungstyp");
|
|
||||||
$I->amHttpAuthenticated("admin", "1q2w3");
|
|
||||||
$I->haveHttpHeader("FHC-API-KEY", "[email protected]");
|
|
||||||
$I->sendGET("v1/accounting/Zahlungstyp/Zahlungstyp", array("zahlungstyp_kurzbz" => "1"));
|
|
||||||
$I->seeResponseCodeIs(200);
|
|
||||||
$I->seeResponseIsJson();
|
|
||||||
$I->seeResponseContainsJson(["error" => 0]);
|
|
||||||
$I->wait();
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
$I = new ApiTester($scenario);
|
|
||||||
$I->wantTo("Test API call v1/CheckUserAuth/: CheckByUsernamePassword");
|
|
||||||
$I->amHttpAuthenticated("admin", "1q2w3");
|
|
||||||
$I->haveHttpHeader("FHC-API-KEY", "[email protected]");
|
|
||||||
$I->sendGET("v1/CheckUserAuth/CheckByUsernamePassword", array("username" => "1", "password" => "1"));
|
|
||||||
$I->seeResponseCodeIs(200);
|
|
||||||
$I->seeResponseIsJson();
|
|
||||||
$I->seeResponseContainsJson(["error" => 0]);
|
|
||||||
$I->wait();
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
$I = new ApiTester($scenario);
|
|
||||||
$I->wantTo("Test API call v1/codex/Akadgrad/: Akadgrad");
|
|
||||||
$I->amHttpAuthenticated("admin", "1q2w3");
|
|
||||||
$I->haveHttpHeader("FHC-API-KEY", "[email protected]");
|
|
||||||
$I->sendGET("v1/codex/Akadgrad/Akadgrad", array("akadgrad_id" => "1"));
|
|
||||||
$I->seeResponseCodeIs(200);
|
|
||||||
$I->seeResponseIsJson();
|
|
||||||
$I->seeResponseContainsJson(["error" => 0]);
|
|
||||||
$I->wait();
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
$I = new ApiTester($scenario);
|
|
||||||
$I->wantTo("Test API call v1/codex/Archiv/: Archiv");
|
|
||||||
$I->amHttpAuthenticated("admin", "1q2w3");
|
|
||||||
$I->haveHttpHeader("FHC-API-KEY", "[email protected]");
|
|
||||||
$I->sendGET("v1/codex/Archiv/Archiv", array("archiv_id" => "1"));
|
|
||||||
$I->seeResponseCodeIs(200);
|
|
||||||
$I->seeResponseIsJson();
|
|
||||||
$I->seeResponseContainsJson(["error" => 0]);
|
|
||||||
$I->wait();
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
$I = new ApiTester($scenario);
|
|
||||||
$I->wantTo("Test API call v1/codex/Aufmerksamdurch/: Aufmerksamdurch");
|
|
||||||
$I->amHttpAuthenticated("admin", "1q2w3");
|
|
||||||
$I->haveHttpHeader("FHC-API-KEY", "[email protected]");
|
|
||||||
$I->sendGET("v1/codex/Aufmerksamdurch/Aufmerksamdurch", array("aufmerksamdurch_kurzbz" => "1"));
|
|
||||||
$I->seeResponseCodeIs(200);
|
|
||||||
$I->seeResponseIsJson();
|
|
||||||
$I->seeResponseContainsJson(["error" => 0]);
|
|
||||||
$I->wait();
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
$I = new ApiTester($scenario);
|
|
||||||
$I->wantTo("Test API call v1/codex/Ausbildung/: Ausbildung");
|
|
||||||
$I->amHttpAuthenticated("admin", "1q2w3");
|
|
||||||
$I->haveHttpHeader("FHC-API-KEY", "[email protected]");
|
|
||||||
$I->sendGET("v1/codex/Ausbildung/Ausbildung", array("ausbildungcode" => "1"));
|
|
||||||
$I->seeResponseCodeIs(200);
|
|
||||||
$I->seeResponseIsJson();
|
|
||||||
$I->seeResponseContainsJson(["error" => 0]);
|
|
||||||
$I->wait();
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
$I = new ApiTester($scenario);
|
|
||||||
$I->wantTo("Test API call v1/codex/Berufstaetigkeit/: Berufstaetigkeit");
|
|
||||||
$I->amHttpAuthenticated("admin", "1q2w3");
|
|
||||||
$I->haveHttpHeader("FHC-API-KEY", "[email protected]");
|
|
||||||
$I->sendGET("v1/codex/Berufstaetigkeit/Berufstaetigkeit", array("berufstaetigkeit_code" => "1"));
|
|
||||||
$I->seeResponseCodeIs(200);
|
|
||||||
$I->seeResponseIsJson();
|
|
||||||
$I->seeResponseContainsJson(["error" => 0]);
|
|
||||||
$I->wait();
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
$I = new ApiTester($scenario);
|
|
||||||
$I->wantTo("Test API call v1/codex/Beschaeftigungsausmass/: Beschaeftigungsausmass");
|
|
||||||
$I->amHttpAuthenticated("admin", "1q2w3");
|
|
||||||
$I->haveHttpHeader("FHC-API-KEY", "[email protected]");
|
|
||||||
$I->sendGET("v1/codex/Beschaeftigungsausmass/Beschaeftigungsausmass", array("beschausmasscode" => "1"));
|
|
||||||
$I->seeResponseCodeIs(200);
|
|
||||||
$I->seeResponseIsJson();
|
|
||||||
$I->seeResponseContainsJson(["error" => 0]);
|
|
||||||
$I->wait();
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
$I = new ApiTester($scenario);
|
|
||||||
$I->wantTo("Test API call v1/codex/Besqual/: Besqual");
|
|
||||||
$I->amHttpAuthenticated("admin", "1q2w3");
|
|
||||||
$I->haveHttpHeader("FHC-API-KEY", "[email protected]");
|
|
||||||
$I->sendGET("v1/codex/Besqual/Besqual", array("besqualcode" => "1"));
|
|
||||||
$I->seeResponseCodeIs(200);
|
|
||||||
$I->seeResponseIsJson();
|
|
||||||
$I->seeResponseContainsJson(["error" => 0]);
|
|
||||||
$I->wait();
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
$I = new ApiTester($scenario);
|
|
||||||
$I->wantTo("Test API call v1/codex/Bisfunktion/: Bisfunktion");
|
|
||||||
$I->amHttpAuthenticated("admin", "1q2w3");
|
|
||||||
$I->haveHttpHeader("FHC-API-KEY", "[email protected]");
|
|
||||||
$I->sendGET("v1/codex/Bisfunktion/Bisfunktion", array("studiengang_kz" => "1", "bisverwendung_id" => "1"));
|
|
||||||
$I->seeResponseCodeIs(200);
|
|
||||||
$I->seeResponseIsJson();
|
|
||||||
$I->seeResponseContainsJson(["error" => 0]);
|
|
||||||
$I->wait();
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
$I = new ApiTester($scenario);
|
|
||||||
$I->wantTo("Test API call v1/codex/Bisio/: Bisio");
|
|
||||||
$I->amHttpAuthenticated("admin", "1q2w3");
|
|
||||||
$I->haveHttpHeader("FHC-API-KEY", "[email protected]");
|
|
||||||
$I->sendGET("v1/codex/Bisio/Bisio", array("bisio_id" => "1"));
|
|
||||||
$I->seeResponseCodeIs(200);
|
|
||||||
$I->seeResponseIsJson();
|
|
||||||
$I->seeResponseContainsJson(["error" => 0]);
|
|
||||||
$I->wait();
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
$I = new ApiTester($scenario);
|
|
||||||
$I->wantTo("Test API call v1/codex/Bisorgform/: Bisorgform");
|
|
||||||
$I->amHttpAuthenticated("admin", "1q2w3");
|
|
||||||
$I->haveHttpHeader("FHC-API-KEY", "[email protected]");
|
|
||||||
$I->sendGET("v1/codex/Bisorgform/Bisorgform", array("bisorgform_kurzbz" => "1"));
|
|
||||||
$I->seeResponseCodeIs(200);
|
|
||||||
$I->seeResponseIsJson();
|
|
||||||
$I->seeResponseContainsJson(["error" => 0]);
|
|
||||||
$I->wait();
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
$I = new ApiTester($scenario);
|
|
||||||
$I->wantTo("Test API call v1/codex/Bisverwendung/: Bisverwendung");
|
|
||||||
$I->amHttpAuthenticated("admin", "1q2w3");
|
|
||||||
$I->haveHttpHeader("FHC-API-KEY", "[email protected]");
|
|
||||||
$I->sendGET("v1/codex/Bisverwendung/Bisverwendung", array("bisverwendung_id" => "1"));
|
|
||||||
$I->seeResponseCodeIs(200);
|
|
||||||
$I->seeResponseIsJson();
|
|
||||||
$I->seeResponseContainsJson(["error" => 0]);
|
|
||||||
$I->wait();
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
$I = new ApiTester($scenario);
|
|
||||||
$I->wantTo("Test API call v1/codex/Bundesland/: All");
|
|
||||||
$I->amHttpAuthenticated("admin", "1q2w3");
|
|
||||||
$I->haveHttpHeader("FHC-API-KEY", "[email protected]");
|
|
||||||
$I->sendGET("v1/codex/Bundesland/All", array());
|
|
||||||
$I->seeResponseCodeIs(200);
|
|
||||||
$I->seeResponseIsJson();
|
|
||||||
$I->seeResponseContainsJson(["error" => 0]);
|
|
||||||
$I->wait();
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
$I = new ApiTester($scenario);
|
|
||||||
$I->wantTo("Test API call v1/codex/Entwicklungsteam/: Entwicklungsteam");
|
|
||||||
$I->amHttpAuthenticated("admin", "1q2w3");
|
|
||||||
$I->haveHttpHeader("FHC-API-KEY", "[email protected]");
|
|
||||||
$I->sendGET("v1/codex/Entwicklungsteam/Entwicklungsteam", array("studiengang_kz" => "1", "mitarbeiter_uid" => "1"));
|
|
||||||
$I->seeResponseCodeIs(200);
|
|
||||||
$I->seeResponseIsJson();
|
|
||||||
$I->seeResponseContainsJson(["error" => 0]);
|
|
||||||
$I->wait();
|
|
||||||
@@ -1,16 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
$I = new ApiTester($scenario);
|
|
||||||
$I->wantTo("Test API call v1/codex/Gemeinde/: Gemeinde GemeindeByPlz");
|
|
||||||
$I->amHttpAuthenticated("admin", "1q2w3");
|
|
||||||
$I->haveHttpHeader("FHC-API-KEY", "[email protected]");
|
|
||||||
$I->sendGET("v1/codex/Gemeinde/Gemeinde", array("gemeinde_id" => "1"));
|
|
||||||
$I->seeResponseCodeIs(200);
|
|
||||||
$I->seeResponseIsJson();
|
|
||||||
$I->seeResponseContainsJson(["error" => 0]);
|
|
||||||
$I->wait();
|
|
||||||
$I->sendGET("v1/codex/Gemeinde/GemeindeByPlz", array("plz" => "1"));
|
|
||||||
$I->seeResponseCodeIs(200);
|
|
||||||
$I->seeResponseIsJson();
|
|
||||||
$I->seeResponseContainsJson(["error" => 0]);
|
|
||||||
$I->wait();
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
$I = new ApiTester($scenario);
|
|
||||||
$I->wantTo("Test API call v1/codex/Hauptberuf/: Hauptberuf");
|
|
||||||
$I->amHttpAuthenticated("admin", "1q2w3");
|
|
||||||
$I->haveHttpHeader("FHC-API-KEY", "[email protected]");
|
|
||||||
$I->sendGET("v1/codex/Hauptberuf/Hauptberuf", array("hauptberufcode" => "1"));
|
|
||||||
$I->seeResponseCodeIs(200);
|
|
||||||
$I->seeResponseIsJson();
|
|
||||||
$I->seeResponseContainsJson(["error" => 0]);
|
|
||||||
$I->wait();
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
$I = new ApiTester($scenario);
|
|
||||||
$I->wantTo("Test API call v1/codex/Lehrform/: Lehrform");
|
|
||||||
$I->amHttpAuthenticated("admin", "1q2w3");
|
|
||||||
$I->haveHttpHeader("FHC-API-KEY", "[email protected]");
|
|
||||||
$I->sendGET("v1/codex/Lehrform/Lehrform", array("lehrform_kurzbz" => "1"));
|
|
||||||
$I->seeResponseCodeIs(200);
|
|
||||||
$I->seeResponseIsJson();
|
|
||||||
$I->seeResponseContainsJson(["error" => 0]);
|
|
||||||
$I->wait();
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
$I = new ApiTester($scenario);
|
|
||||||
$I->wantTo("Test API call v1/codex/Lgartcode/: Lgartcode");
|
|
||||||
$I->amHttpAuthenticated("admin", "1q2w3");
|
|
||||||
$I->haveHttpHeader("FHC-API-KEY", "[email protected]");
|
|
||||||
$I->sendGET("v1/codex/Lgartcode/Lgartcode", array("lgartcode" => "1"));
|
|
||||||
$I->seeResponseCodeIs(200);
|
|
||||||
$I->seeResponseIsJson();
|
|
||||||
$I->seeResponseContainsJson(["error" => 0]);
|
|
||||||
$I->wait();
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
$I = new ApiTester($scenario);
|
|
||||||
$I->wantTo("Test API call v1/codex/Mobilitaetsprogramm/: Mobilitaetsprogramm");
|
|
||||||
$I->amHttpAuthenticated("admin", "1q2w3");
|
|
||||||
$I->haveHttpHeader("FHC-API-KEY", "[email protected]");
|
|
||||||
$I->sendGET("v1/codex/Mobilitaetsprogramm/Mobilitaetsprogramm", array("mobilitaetsprogramm_code" => "1"));
|
|
||||||
$I->seeResponseCodeIs(200);
|
|
||||||
$I->seeResponseIsJson();
|
|
||||||
$I->seeResponseContainsJson(["error" => 0]);
|
|
||||||
$I->wait();
|
|
||||||
@@ -1,16 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
$I = new ApiTester($scenario);
|
|
||||||
$I->wantTo("Test API call v1/codex/Nation/: Nation All");
|
|
||||||
$I->amHttpAuthenticated("admin", "1q2w3");
|
|
||||||
$I->haveHttpHeader("FHC-API-KEY", "[email protected]");
|
|
||||||
$I->sendGET("v1/codex/Nation/Nation", array("nation_code" => "1"));
|
|
||||||
$I->seeResponseCodeIs(200);
|
|
||||||
$I->seeResponseIsJson();
|
|
||||||
$I->seeResponseContainsJson(["error" => 0]);
|
|
||||||
$I->wait();
|
|
||||||
$I->sendGET("v1/codex/Nation/All", array("orderEnglish" => "1", "ohnesperre" => "1"));
|
|
||||||
$I->seeResponseCodeIs(200);
|
|
||||||
$I->seeResponseIsJson();
|
|
||||||
$I->seeResponseContainsJson(["error" => 0]);
|
|
||||||
$I->wait();
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
$I = new ApiTester($scenario);
|
|
||||||
$I->wantTo("Test API call v1/codex/Note/: Note");
|
|
||||||
$I->amHttpAuthenticated("admin", "1q2w3");
|
|
||||||
$I->haveHttpHeader("FHC-API-KEY", "[email protected]");
|
|
||||||
$I->sendGET("v1/codex/Note/Note", array("note" => "1"));
|
|
||||||
$I->seeResponseCodeIs(200);
|
|
||||||
$I->seeResponseIsJson();
|
|
||||||
$I->seeResponseContainsJson(["error" => 0]);
|
|
||||||
$I->wait();
|
|
||||||
@@ -1,21 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
$I = new ApiTester($scenario);
|
|
||||||
$I->wantTo("Test API call v1/codex/Orgform/: Orgform All OrgformLV");
|
|
||||||
$I->amHttpAuthenticated("admin", "1q2w3");
|
|
||||||
$I->haveHttpHeader("FHC-API-KEY", "[email protected]");
|
|
||||||
$I->sendGET("v1/codex/Orgform/Orgform", array("orgform_kurzbz" => "1"));
|
|
||||||
$I->seeResponseCodeIs(200);
|
|
||||||
$I->seeResponseIsJson();
|
|
||||||
$I->seeResponseContainsJson(["error" => 0]);
|
|
||||||
$I->wait();
|
|
||||||
$I->sendGET("v1/codex/Orgform/All", array());
|
|
||||||
$I->seeResponseCodeIs(200);
|
|
||||||
$I->seeResponseIsJson();
|
|
||||||
$I->seeResponseContainsJson(["error" => 0]);
|
|
||||||
$I->wait();
|
|
||||||
$I->sendGET("v1/codex/Orgform/OrgformLV", array());
|
|
||||||
$I->seeResponseCodeIs(200);
|
|
||||||
$I->seeResponseIsJson();
|
|
||||||
$I->seeResponseContainsJson(["error" => 0]);
|
|
||||||
$I->wait();
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
$I = new ApiTester($scenario);
|
|
||||||
$I->wantTo("Test API call v1/codex/Verwendung/: Verwendung");
|
|
||||||
$I->amHttpAuthenticated("admin", "1q2w3");
|
|
||||||
$I->haveHttpHeader("FHC-API-KEY", "[email protected]");
|
|
||||||
$I->sendGET("v1/codex/Verwendung/Verwendung", array("verwendung_code" => "1"));
|
|
||||||
$I->seeResponseCodeIs(200);
|
|
||||||
$I->seeResponseIsJson();
|
|
||||||
$I->seeResponseContainsJson(["error" => 0]);
|
|
||||||
$I->wait();
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
$I = new ApiTester($scenario);
|
|
||||||
$I->wantTo("Test API call v1/codex/Zgv/: Zgv");
|
|
||||||
$I->amHttpAuthenticated("admin", "1q2w3");
|
|
||||||
$I->haveHttpHeader("FHC-API-KEY", "[email protected]");
|
|
||||||
$I->sendGET("v1/codex/Zgv/Zgv", array("zgv_code" => "1"));
|
|
||||||
$I->seeResponseCodeIs(200);
|
|
||||||
$I->seeResponseIsJson();
|
|
||||||
$I->seeResponseContainsJson(["error" => 0]);
|
|
||||||
$I->wait();
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
$I = new ApiTester($scenario);
|
|
||||||
$I->wantTo("Test API call v1/codex/Zgvdoktor/: Zgvdoktor");
|
|
||||||
$I->amHttpAuthenticated("admin", "1q2w3");
|
|
||||||
$I->haveHttpHeader("FHC-API-KEY", "[email protected]");
|
|
||||||
$I->sendGET("v1/codex/Zgvdoktor/Zgvdoktor", array("zgvdoktor_code" => "1"));
|
|
||||||
$I->seeResponseCodeIs(200);
|
|
||||||
$I->seeResponseIsJson();
|
|
||||||
$I->seeResponseContainsJson(["error" => 0]);
|
|
||||||
$I->wait();
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
$I = new ApiTester($scenario);
|
|
||||||
$I->wantTo("Test API call v1/codex/Zgvgruppe/: Zgvgruppe");
|
|
||||||
$I->amHttpAuthenticated("admin", "1q2w3");
|
|
||||||
$I->haveHttpHeader("FHC-API-KEY", "[email protected]");
|
|
||||||
$I->sendGET("v1/codex/Zgvgruppe/Zgvgruppe", array("gruppe_kurzbz" => "1"));
|
|
||||||
$I->seeResponseCodeIs(200);
|
|
||||||
$I->seeResponseIsJson();
|
|
||||||
$I->seeResponseContainsJson(["error" => 0]);
|
|
||||||
$I->wait();
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
$I = new ApiTester($scenario);
|
|
||||||
$I->wantTo("Test API call v1/codex/Zgvmaster/: Zgvmaster");
|
|
||||||
$I->amHttpAuthenticated("admin", "1q2w3");
|
|
||||||
$I->haveHttpHeader("FHC-API-KEY", "[email protected]");
|
|
||||||
$I->sendGET("v1/codex/Zgvmaster/Zgvmaster", array("zgvmas_code" => "1"));
|
|
||||||
$I->seeResponseCodeIs(200);
|
|
||||||
$I->seeResponseIsJson();
|
|
||||||
$I->seeResponseContainsJson(["error" => 0]);
|
|
||||||
$I->wait();
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
$I = new ApiTester($scenario);
|
|
||||||
$I->wantTo("Test API call v1/codex/Zweck/: Zweck");
|
|
||||||
$I->amHttpAuthenticated("admin", "1q2w3");
|
|
||||||
$I->haveHttpHeader("FHC-API-KEY", "[email protected]");
|
|
||||||
$I->sendGET("v1/codex/Zweck/Zweck", array("zweck_code" => "1"));
|
|
||||||
$I->seeResponseCodeIs(200);
|
|
||||||
$I->seeResponseIsJson();
|
|
||||||
$I->seeResponseContainsJson(["error" => 0]);
|
|
||||||
$I->wait();
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
$I = new ApiTester($scenario);
|
|
||||||
$I->wantTo("Test API call v1/content/Ampel/: Ampel");
|
|
||||||
$I->amHttpAuthenticated("admin", "1q2w3");
|
|
||||||
$I->haveHttpHeader("FHC-API-KEY", "[email protected]");
|
|
||||||
$I->sendGET("v1/content/Ampel/Ampel", array("ampel_id" => "1"));
|
|
||||||
$I->seeResponseCodeIs(200);
|
|
||||||
$I->seeResponseIsJson();
|
|
||||||
$I->seeResponseContainsJson(["error" => 0]);
|
|
||||||
$I->wait();
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
$I = new ApiTester($scenario);
|
|
||||||
$I->wantTo("Test API call v1/content/Content/: Content");
|
|
||||||
$I->amHttpAuthenticated("admin", "1q2w3");
|
|
||||||
$I->haveHttpHeader("FHC-API-KEY", "[email protected]");
|
|
||||||
$I->sendGET("v1/content/Content/Content", array("content_id" => "1"));
|
|
||||||
$I->seeResponseCodeIs(200);
|
|
||||||
$I->seeResponseIsJson();
|
|
||||||
$I->seeResponseContainsJson(["error" => 0]);
|
|
||||||
$I->wait();
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
$I = new ApiTester($scenario);
|
|
||||||
$I->wantTo("Test API call v1/content/Contentchild/: Contentchild");
|
|
||||||
$I->amHttpAuthenticated("admin", "1q2w3");
|
|
||||||
$I->haveHttpHeader("FHC-API-KEY", "[email protected]");
|
|
||||||
$I->sendGET("v1/content/Contentchild/Contentchild", array("contentchild_id" => "1"));
|
|
||||||
$I->seeResponseCodeIs(200);
|
|
||||||
$I->seeResponseIsJson();
|
|
||||||
$I->seeResponseContainsJson(["error" => 0]);
|
|
||||||
$I->wait();
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
$I = new ApiTester($scenario);
|
|
||||||
$I->wantTo("Test API call v1/content/Contentgruppe/: Contentgruppe");
|
|
||||||
$I->amHttpAuthenticated("admin", "1q2w3");
|
|
||||||
$I->haveHttpHeader("FHC-API-KEY", "[email protected]");
|
|
||||||
$I->sendGET("v1/content/Contentgruppe/Contentgruppe", array("gruppe_kurzbz" => "1", "content_id" => "1"));
|
|
||||||
$I->seeResponseCodeIs(200);
|
|
||||||
$I->seeResponseIsJson();
|
|
||||||
$I->seeResponseContainsJson(["error" => 0]);
|
|
||||||
$I->wait();
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
$I = new ApiTester($scenario);
|
|
||||||
$I->wantTo("Test API call v1/content/Contentlog/: Contentlog");
|
|
||||||
$I->amHttpAuthenticated("admin", "1q2w3");
|
|
||||||
$I->haveHttpHeader("FHC-API-KEY", "[email protected]");
|
|
||||||
$I->sendGET("v1/content/Contentlog/Contentlog", array("contentlog_id" => "1"));
|
|
||||||
$I->seeResponseCodeIs(200);
|
|
||||||
$I->seeResponseIsJson();
|
|
||||||
$I->seeResponseContainsJson(["error" => 0]);
|
|
||||||
$I->wait();
|
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user