Merge remote-tracking branch 'origin/feature-30660/FHC4_StudierendenGUI_Prototyp' into feature-30660/FHC4_StudierendenGUI_Prototyp

public/js/components/Betriebsmittel/Betriebsmittel.js

@@ -137,6 +137,11 @@ export default {
 			filteredInventar: []
 		}
 	},
+	watch: {
+		uid(){
+			this.$refs.table.tabulator.setData('api/frontend/v1/stv/Betriebsmittel/getAllBetriebsmittel/' + this.uid + '/' + this.person_id);
+		}
+	},
 	methods: {
 		actionEditBetriebsmittel(betriebsmittelperson_id){
 			this.statusNew = false;

public/js/components/Form/Upload/Dms.js

@@ -53,8 +53,14 @@ export default {
 	},
 	watch: {
 		modelValue(n) {
-			if (n instanceof FileList)
+			if (!n)
+				return;
+			if (n instanceof FileList) {
+				if (!this.$refs.upload) {
+					return;
+				}
 				return this.$refs.upload.files = n;
+			}
 
 			const dt = new DataTransfer();
 			const dms = [];

public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js

@@ -168,6 +168,11 @@ export default{
 			}, {}));
 		}
 	},
+	watch: {
+		uid(){
+			this.$refs.table.tabulator.setData('api/frontend/v1/stv/Kontakt/getAdressen/' + this.uid);
+		}
+	},
 	methods:{
 		actionNewAdress(){
 			this.$refs.newAdressModal.show();
@@ -266,9 +271,6 @@ export default{
 					this.filteredFirmen = result.data.retval;
 				});
 		},
-		reload(){
-			this.$refs.table.reloadTable();
-		},
 		hideModal(modalRef){
 			this.$refs[modalRef].hide();
 		},

public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js

@@ -114,6 +114,11 @@ export default{
 			}
 		}
 	},
+	watch: {
+		uid(){
+			this.$refs.table.tabulator.setData('api/frontend/v1/stv/Kontakt/getBankverbindung/' + this.uid);
+		}
+	},
 	methods:{
 		actionNewBankverbindung(){
 			this.$refs.newBankverbindungModal.show();

public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js

@@ -111,6 +111,11 @@ export default{
 			filteredStandorte: null
 		}
 	},
+	watch: {
+		uid(){
+			this.$refs.table.tabulator.setData('api/frontend/v1/stv/Kontakt/getKontakte/' + this.uid);
+		}
+	},
 	methods:{
 		actionNewContact(){
 			this.$refs.newContactModal.show();

public/js/components/Stv/Studentenverwaltung/Details/Notizen.js

@@ -14,13 +14,50 @@ export default {
 			ref="formc"
 			typeId="person_id"
 			:id="modelValue.person_id"
-			:showErweitert=true
-			:showDocument=true
-			:showTinyMCE="true"
+			notizLayout="twoColumnsFormLeft"
+			:showErweitert="false"
+			:showDocument="false"
+			:showTinyMCE="false"
+			:visibleColumns=['titel','text','verfasser','bearbeiter']
 			>
 		</NotizComponent>
 		
-<!--		<br><br>
+<!--		
+---------------------------------------------------------------------------------------------
+-------------------- DESCRIPTION FOR PARAMETER PROPS ----------------------------------------
+---------------------------------------------------------------------------------------------
+
+notizLayout: "classicFas", "twoColumnsFormLeft", twoColumnsFormRight"
+
+showErweitert: if true: section with following fields will be displayed:
+	'verfasser', 'bearbeiter', 'von', 'bis'
+
+showDocument: if true: section with documentHandling will be displayed
+
+showTinyMCE: if true: section with WYSIWYG Editor for Text will be displayed
+
+typeId: id to which table the notizdata should be connected... eg. person_id, prestudent_id, mitarbeiter_uid, projekt_kurzbz, projektphase_id, projekttask_id,
+	bestellung_id, lehreinheit_id, anrechnung_id, uid  
+	in progress for extensions
+
+visibleColumns: list, which fields shoult be showed as default in filter component
+		fullVersion: :visibleColumns=['titel','text','bearbeiter','verfasser','von','bis','erledigt']
+
+---------------------------------------------------------------------------------------------
+---------------------------------------------------------------------------------------------	
+-->	
+
+
+
+
+<!--
+
+---------------------------------------------------------------------------------------------
+------------------------ SOME TESTDATA	-----------------------------------------------------	
+---------------------------------------------------------------------------------------------
+
+
+<br><br>
 		<h3>Test prestudentId</h3>
 		<NotizComponent
 			ref="formc"

public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js

@@ -84,6 +84,9 @@ export default {
 				this.deltaArray = delta;
 			},
 			deep: true
+		},
+		modelValue(n){
+			this.loadPrestudent(n);
 		}
 	},
 

public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js

@@ -233,6 +233,9 @@ export default{
 				const start = this.status_kurzbz;
 			},
 			deep: true
+		},
+		prestudent_id(){
+			this.$refs.table.tabulator.setData('api/frontend/v1/stv/Status/getHistoryPrestudent/' + this.prestudent_id);
 		}
 	},
 	methods: {