From 857a84473129c3c91ca59c357fe22e5b36b56cee Mon Sep 17 00:00:00 2001
From: KarpAlex <karpenko@technikum-wien.at>
Date: Mon, 8 Apr 2024 18:53:06 +0200
Subject: [PATCH] progress numbers and prestudent_id are displayed when
 archiving documents

---
 content/student/studentoverlay.js.php         | 16 +++++++++++++++-
 content/student/studentzeugnisoverlay.xul.php |  4 ++++
 include/dokument_export.class.php             |  2 +-
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/content/student/studentoverlay.js.php b/content/student/studentoverlay.js.php
index 11a4d862f..c8d0b6ab1 100644
--- a/content/student/studentoverlay.js.php
+++ b/content/student/studentoverlay.js.php
@@ -3559,8 +3559,13 @@ function StudentZeugnisDokumentArchivieren()
 			break;
 	}
 
+	// Speichern zum Anzeigen des Aktivierungsfortschritts
 	var labelalt = document.getElementById('student-zeugnis-button-archive').label;
 	document.getElementById('student-zeugnis-button-archive').label='Loading...';
+	var amountArchived = 0;
+	document.getElementById('student-zeugnis-archive-progress-row').hidden=false;
+	var prestudentIdArray = getMultipleTreeCellText(tree, 'student-treecol-prestudent_id');
+	document.getElementById('student-zeugnis-archive-progress').value="0/"+prestudentIdArray.length;
 
 	//Dokument fuer alle markierten Studenten archivieren
 	for (var t=0; t<numRanges; t++)
@@ -3594,12 +3599,21 @@ function StudentZeugnisDokumentArchivieren()
 			var response = req.execute();
 			if(response!='')
 				errormsg = errormsg + response;
+			else
+			{
+				// Fortschritt der Archivierung anzeigen
+				document.getElementById('student-zeugnis-archive-progress').value
+					=++amountArchived+"/"+prestudentIdArray.length+" (PreStudentInnenID: "+prestudent_id+")";
+			}
 		}
 	}
 
 	if(errormsg!='')
 		alert(errormsg);
+
+	// Fortschrittsfelder zurücksetzen
 	document.getElementById('student-zeugnis-button-archive').label=labelalt;
+	document.getElementById('student-zeugnis-archive-progress-row').hidden=true;
 	StudentAkteTreeDatasource.Refresh(false);
 }
 
@@ -4783,7 +4797,7 @@ function StudentNotenMoveFromAntrag()
 
 	var uid = document.getElementById('student-detail-textbox-uid').value;
 	req.add('student_uid', uid);
-	
+
 	var txt = "?";
 	for(var q in req.parms) {
 		txt = txt+'&'+req.parms[q].name+'='+encodeURIComponent(req.parms[q].value);
diff --git a/content/student/studentzeugnisoverlay.xul.php b/content/student/studentzeugnisoverlay.xul.php
index 97e3d21eb..b805cc987 100644
--- a/content/student/studentzeugnisoverlay.xul.php
+++ b/content/student/studentzeugnisoverlay.xul.php
@@ -144,6 +144,10 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
 						</menulist>
 						<button id="student-zeugnis-button-archive" label="Archivieren" disabled="false" oncommand="StudentZeugnisDokumentArchivieren()"/>
 					</row>
+					<row id="student-zeugnis-archive-progress-row" hidden="true">
+						<label value="Archiviert: "/>
+						<label id="student-zeugnis-archive-progress" class="text" value="0/0"/>
+					</row>
 				</rows>
 		</grid>
 	</groupbox>
diff --git a/include/dokument_export.class.php b/include/dokument_export.class.php
index 458cd7c02..e4dc0c8bd 100644
--- a/include/dokument_export.class.php
+++ b/include/dokument_export.class.php
@@ -610,7 +610,7 @@ class dokument_export
 			}
 		}
 	}
-	
+
 	public function setXMLTag_archivierbar()
 	{
 		$archivierbar = $this->xml_data->createElement("archivierbar", "true");