Merge branch 'master' into feature-39172/Absturz_bei_Mehrfacharchivierung_von_Dokumenten

content/student/studentoverlay.js.php

@@ -3572,8 +3572,13 @@ function StudentZeugnisDokumentArchivieren()
 			break;
 	}
 
+	// Speichern zum Anzeigen des Archivierungsfortschritts
 	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++)
@@ -3607,12 +3612,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);
 }
 

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>

include/dokument_export.class.php

@@ -610,7 +610,7 @@ class dokument_export
 			}
 		}
 	}
-	
+
 	public function setXMLTag_archivierbar()
 	{
 		$archivierbar = $this->xml_data->createElement("archivierbar", "true");

public/css/Studentenverwaltung.css

@@ -198,7 +198,7 @@ html.fs_huge {
 }
 
 .tiny-90 div.tox.tox-tinymce {
-	height: 90% !important;
+	height: 90%;
 }
 
 /* slim begin */

public/js/components/Messages/Details/NewMessage/Modal.js

@@ -63,7 +63,7 @@ export default {
 			const vm = this;
 			tinymce.init({
 				target: this.$refs.editor.$refs.input, //Important: not selector: to enable multiple import of component
-				//height: 800,
+				height: 700,
 				//plugins: ['lists'],
 				toolbar: 'styleselect | bold italic underline | alignleft aligncenter alignright alignjustify | link',
 				plugins: 'link',
@@ -345,7 +345,7 @@ export default {
 									type="textarea"
 									v-model="formData.body"
 									name="body"
-									rows="35"
+									rows="75"
 									cols="75"
 									>
 								</form-input>