From 9a4c61d1c359002f184dc89728e1cea4993f1964 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= Date: Thu, 27 Apr 2023 17:50:03 +0200 Subject: [PATCH] Fixed Abgabetool Lecturer View --- cis/private/lehre/abgabe_lektor_details.php | 170 ++++++------------- cis/private/lehre/abgabe_student_details.php | 4 +- locale/de-AT/abgabetool.php | 4 +- locale/en-US/abgabetool.php | 4 +- 4 files changed, 58 insertions(+), 124 deletions(-) diff --git a/cis/private/lehre/abgabe_lektor_details.php b/cis/private/lehre/abgabe_lektor_details.php index 238046224..a40136868 100644 --- a/cis/private/lehre/abgabe_lektor_details.php +++ b/cis/private/lehre/abgabe_lektor_details.php @@ -592,18 +592,9 @@ while ($row=@$db->db_fetch_object($result)) $htmlstr .= "\n"; $htmlstr .= "\n"; + $uploadedDocumentSigned = null; if (!$row->abgabedatum) { - $uploadedDocumentSigned = null; - - $htmlstr .= "
\n"; - $htmlstr .= "\n"; - $htmlstr .= "\n"; - $htmlstr .= "\n"; - $htmlstr .= "\n"; - $htmlstr .= "\n"; - $htmlstr .= "\n"; - if ($row->datumdb_fetch_object($result)) $fcol='#000000'; } } - //$htmlstr .= "fixtermin=='t'?'checked=\"checked\"':'')." >"; - //$htmlstr .= "fixtermin=='t'?'checked="checked" style="background-color:#FF0000;"':'')." disabled>"; + if($row->fixtermin=='t') { $htmlstr .= "J"; @@ -684,113 +674,6 @@ while ($row=@$db->db_fetch_object($result)) { $htmlstr .= "        "; } - - //$htmlstr .= "fixtermin=='t'?'checked=\"checked\"':'')." >"; - //$htmlstr .= "fixtermin=='t'?'checked="checked" style="background-color:#FF0000;"':'')." disabled>"; - if($row->fixtermin=='t') - { - $htmlstr .= "J"; - } - else - { - $htmlstr .= "N"; - } - $htmlstr .= " \n"; - $htmlstr .= " \n"; - $htmlstr .= " \n"; - $htmlstr .= " \n"; - $htmlstr .= " ".($row->abgabedatum==''?' ':$datum_obj->formatDatum($row->abgabedatum,'d.m.Y'))."\n"; - if($user==$row->insertvon && $betreuerart!="Zweitbegutachter") - { - $htmlstr .= " "; - - if(!$row->abgabedatum) - { - $htmlstr .= " "; - } - else - { - $htmlstr .= "        "; - } - } - else - { - $htmlstr .= "               "; - } - if($row->abgabedatum && $row->paabgabetyp_kurzbz=="end") - { - $htmlstr .= " zusätzliche Daten"; - } - else - { - $htmlstr .= "     "; - } - - if (file_exists(PAABGABE_PATH.$row->paabgabe_id.'_'.$uid.'.pdf')) - { - if ($row->paabgabetyp_kurzbz == 'end') - { - // Check if the document is signed - $signList = SignatureLib::list(PAABGABE_PATH.$row->paabgabe_id.'_'.$uid.'.pdf'); - if (is_array($signList) && count($signList) > 0) - { - // The document is signed - } - elseif ($signList === null) - { - $uploadedDocumentSigned = 'WARNING: signature server error'; - } - else - { - $uploadedDocumentSigned = $p->t('abgabetool/uploadedDocumentNotSigned'); - } - } - - $htmlstr .= " - - PDF - - "; - } - else - { - $htmlstr .= "     "; - } - - $htmlstr .= " \n"; - - if ($uploadedDocumentSigned != null) - { - $htmlstr .= ' - - - -
- '.$uploadedDocumentSigned.' -
- - '; - } - - $htmlstr .= "\n"; } else { @@ -812,6 +695,53 @@ while ($row=@$db->db_fetch_object($result)) { $htmlstr .= "     "; } + + if (file_exists(PAABGABE_PATH.$row->paabgabe_id.'_'.$uid.'.pdf')) + { + $signaturVorhanden = false; + if ($row->paabgabetyp_kurzbz == 'end') + { + // Check if the document is signed + $signList = SignatureLib::list(PAABGABE_PATH.$row->paabgabe_id.'_'.$uid.'.pdf'); + if (is_array($signList) && count($signList) > 0) + { + $signaturVorhanden = true; + // The document is signed + } + elseif ($signList === null) + { + $uploadedDocumentSigned = 'WARNING: signature server error'; + } + else + { + $uploadedDocumentSigned = $p->t('abgabetool/uploadedDocumentNotSigned'); + } + } + if ($uploadedDocumentSigned != null) + { + $htmlstr .= ' + +
+ '.$uploadedDocumentSigned.' +
+ '; + } + elseif($signaturVorhanden) + { + $htmlstr .= ' + +
+ '.$p->t('abgabetool/uploadedDocumentSigned').' +
+ '; + } + } + else + { + $htmlstr .= "     "; + } + + $htmlstr .= " \n"; @@ -830,7 +760,7 @@ $htmlstr .= ''."\n"; //$htmlstr .= ""; $htmlstr .= "  "; -$htmlstr .= " \n"; +$htmlstr .= " \n"; $htmlstr .= "