@@ -46,15 +46,13 @@ export default {
this.children = children;
},
getPayload: function() {
- var children = this.children;
- var that = this;
+ var payload = [];
- this.payload = [];
- children.forEach(function(gb) {
- that.payload.push(that.$refs[gb.guioptions.id][0].getPayload());
- });
+ for( var i in this.$refs.parts ) {
+ payload.push(this.$refs.parts[i].getPayload());
+ }
- return this.payload;
+ return payload;
}
}
}
diff --git a/public/js/components/vbform/infos.js b/public/js/components/vbform/infos.js
new file mode 100644
index 000000000..4f514f99d
--- /dev/null
+++ b/public/js/components/vbform/infos.js
@@ -0,0 +1,12 @@
+export default {
+ template: `
+
+ `,
+ props: [
+ 'infos'
+ ]
+}
diff --git a/public/js/components/vbform/presets_chooser.js b/public/js/components/vbform/presets_chooser.js
index d185dca1f..a77a4b7ac 100644
--- a/public/js/components/vbform/presets_chooser.js
+++ b/public/js/components/vbform/presets_chooser.js
@@ -1,28 +1,18 @@
-import vertragsbestandteilhelper from './vertragsbestandteilhelper.js';
-import debug_viewer from './debug_viewer.js';
-
export default {
template: `
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
`,
props:[
@@ -30,31 +20,16 @@ export default {
],
data: function() {
return {
- selectedpresetidx: 0,
- selectedpresetvbs: [],
- selectedpresetdata: {},
- vbhjson: ''
+ selectedpresetidx: 1
}
},
- components: {
- 'vertragsbestandteilhelper': vertragsbestandteilhelper,
- 'debug_viewer': debug_viewer
- },
+ emits: [
+ "presetselected"
+ ],
methods: {
- selectpreset: function(idx) {
- if( typeof this.presets[idx] !== 'undefined' ) {
- this.seletedpresetidx = idx;
- this.selectedpresetvbs = this.presets[idx].vbs;
- this.selectedpresetdata = this.presets[idx].data;
- }
- },
- isactive: function(idx) {
- return (idx === this.selectedpresetidx) ? 'active' : '';
- },
- process_json: function(payload) {
- this.vbhjson = payload;
+ selectpreset: function() {
+ var preset = this.presets[this.selectedpresetidx];
+ this.$emit("presetselected", preset);
}
- },
- computed: {
}
}
diff --git a/public/js/components/vbform/sections.js b/public/js/components/vbform/sections.js
new file mode 100644
index 000000000..60832818e
--- /dev/null
+++ b/public/js/components/vbform/sections.js
@@ -0,0 +1,10 @@
+export default {
+ props: [
+ 'preset'
+ ],
+ template: `
+
+ `
+}
diff --git a/public/js/components/vbform/tab.js b/public/js/components/vbform/tab.js
new file mode 100644
index 000000000..b3e953cef
--- /dev/null
+++ b/public/js/components/vbform/tab.js
@@ -0,0 +1,51 @@
+import presetable from '../../mixins/vbform/presetable.js';
+import vertragsbestandteillist from '../../components/vbform/vertragsbestandteillist.js';
+import dv from './dv.js';
+
+export default {
+ template: `
+
+
+
+ `,
+ props: [
+ 'activetab'
+ ],
+ data: function() {
+ return {
+ payload: {
+ type: 'tab',
+ guioptions: {
+ title: '',
+ id: ''
+ },
+ children: []
+ }
+ };
+ },
+ components: {
+ "dv": dv,
+ "vertragsbestandteillist": vertragsbestandteillist
+ },
+ mixins: [
+ presetable
+ ],
+ methods: {
+ getPayload: function() {
+ var children = [];
+ for( var i in this.$refs.parts ) {
+ children.push(this.$refs.parts[i].getPayload());
+ }
+ var payload = {
+ type: 'tab',
+ guioptions: JSON.parse(JSON.stringify(this.preset.guioptions)),
+ children: children
+ };
+ return payload;
+ }
+ }
+}
diff --git a/public/js/components/vbform/tabs.js b/public/js/components/vbform/tabs.js
new file mode 100644
index 000000000..f55e10ace
--- /dev/null
+++ b/public/js/components/vbform/tabs.js
@@ -0,0 +1,58 @@
+import presetable from '../../mixins/vbform/presetable.js';
+import tab from './tab.js';
+
+export default {
+ template: `
+
+
+
+
+
+
+
+
+
+ `,
+ components: {
+ "tab": tab
+ },
+ mixins: [
+ presetable
+ ],
+ created: function() {
+ if( this.children.length > 0 ) {
+ this.activetab = this.children[0].guioptions.id;
+ }
+ },
+ data: function() {
+ return {
+ activetab: ''
+ }
+ },
+ methods: {
+ getPayload: function() {
+ var children = [];
+ for( var i in this.$refs.parts ) {
+ children.push(this.$refs.parts[i].getPayload());
+ }
+ var payload = {
+ "type": "tabs",
+ "guioptions": JSON.parse(JSON.stringify(this.preset.guioptions)),
+ "children": children
+ }
+ return payload;
+ }
+ }
+}
diff --git a/public/js/components/vbform/vbformhelper.js b/public/js/components/vbform/vbformhelper.js
new file mode 100644
index 000000000..386dbfcee
--- /dev/null
+++ b/public/js/components/vbform/vbformhelper.js
@@ -0,0 +1,52 @@
+import presetable from '../../mixins/vbform/presetable.js';
+import tabs from './tabs.js';
+import vertragsbestandteillist from './vertragsbestandteillist.js';
+import dv from './dv.js';
+import store from './vbsharedstate.js';
+
+export default {
+ template: `
+
+ `,
+ components: {
+ "tabs": tabs,
+ "dv": dv,
+ "vertragsbestandteillist": vertragsbestandteillist
+ },
+ mixins: [
+ presetable
+ ],
+ data: function() {
+ return {
+ store: store
+ };
+ },
+ emits: [
+ "vbhjsonready"
+ ],
+ methods: {
+ getJSON: function() {
+ var children = [];
+ for ( var i in this.$refs.parts) {
+ children.push(this.$refs.parts[i].getPayload());
+ }
+ var payload = {
+ "type": "formdata",
+ "children": children,
+ "data": this.store.getDVPayload(),
+ "vbs": this.store.getVBsPayload()
+ };
+ this.$emit('vbhjsonready', JSON.stringify(payload, null, 2));
+ }
+ }
+}
diff --git a/public/js/components/vbform/vbsharedstate.js b/public/js/components/vbform/vbsharedstate.js
index d55cab423..d9912dfef 100644
--- a/public/js/components/vbform/vbsharedstate.js
+++ b/public/js/components/vbform/vbsharedstate.js
@@ -2,5 +2,32 @@ export default Vue.reactive({
gueltigkeit: {
gueltig_ab: '',
gueltig_bis: ''
+ },
+ dv: {
+
+ },
+ vbs: {
+
+ },
+ getDV: function() {
+ return this.dv;
+ },
+ setDV: function(dv) {
+ this.dv = JSON.parse(JSON.stringify(dv));
+ },
+ getDVPayload: function() {
+ return JSON.parse(JSON.stringify(this.dv));
+ },
+ addVB: function(uuid, vb) {
+ this.vbs[uuid] = vb;
+ },
+ removeVB: function(uuid) {
+ delete this.vbs[uuid];
+ },
+ getVB: function(uuid) {
+ return this.vbs[uuid];
+ },
+ getVBsPayload: function() {
+ return JSON.parse(JSON.stringify(this.vbs));
}
});
diff --git a/public/js/components/vbform/vertragsbestandteil_stunden.js b/public/js/components/vbform/vertragsbestandteil_stunden.js
index 5c81852ef..7286ea809 100644
--- a/public/js/components/vbform/vertragsbestandteil_stunden.js
+++ b/public/js/components/vbform/vertragsbestandteil_stunden.js
@@ -1,10 +1,14 @@
import gehaltsbestandteilhelper from './gehaltsbestandteilhelper.js';
import gueltigkeit from './gueltigkeit.js';
import configurable from '../../mixins/vbform/configurable.js';
+import errors from './errors.js';
+import infos from './infos.js';
export default {
template: `
+
+
@@ -23,7 +27,9 @@ export default {
`,
components: {
'gehaltsbestandteilhelper': gehaltsbestandteilhelper,
- 'gueltigkeit': gueltigkeit
+ 'gueltigkeit': gueltigkeit,
+ 'infos': infos,
+ 'errors': errors
},
mixins: [
configurable
diff --git a/public/js/components/vbform/vertragsbestandteillist.js b/public/js/components/vbform/vertragsbestandteillist.js
new file mode 100644
index 000000000..3d2cd952f
--- /dev/null
+++ b/public/js/components/vbform/vertragsbestandteillist.js
@@ -0,0 +1,112 @@
+import vertragsbestandteilstunden from './vertragsbestandteil_stunden.js';
+import vertragsbestandteilzeitaufzeichnung from './vertragsbestandteil_zeitaufzeichnung.js';
+import vertragsbestandteilfunktion from './vertragsbestandteil_funktion.js';
+import vertragsbestandteilfreitext from './vertragsbestandteil_freitext.js';
+import vertragsbestandteilkuendigungsfrist from './vertragsbestandteil_kuendigungsfrist.js';
+import presetable from '../../mixins/vbform/presetable.js';
+import uuid from '../../helpers/vbform/uuid.js';
+import store from './vbsharedstate.js';
+
+export default {
+ template: `
+
+ `,
+ props: [
+ 'data'
+ ],
+ data: function() {
+ return {
+ title: '',
+ vertragsbestandteiltyp: '',
+ store: store,
+ payload: {
+ type: 'vertragsbestandteillist',
+ guioptions: {
+ title: '',
+ vertragsbestandteiltyp: '',
+ },
+ children: []
+ }
+ };
+ },
+ components: {
+ 'vertragsbestandteilstunden': vertragsbestandteilstunden,
+ 'vertragsbestandteilzeitaufzeichnung': vertragsbestandteilzeitaufzeichnung,
+ 'vertragsbestandteilfunktion': vertragsbestandteilfunktion,
+ 'vertragsbestandteilfreitext': vertragsbestandteilfreitext,
+ 'vertragsbestandteilkuendigungsfrist': vertragsbestandteilkuendigungsfrist
+ },
+ mixins: [
+ presetable
+ ],
+ created: function() {
+ this.title = this.preset.guioptions.title;
+ this.vertragsbestandteiltyp = this.preset.guioptions.vertragsbestandteiltyp
+ },
+ methods: {
+ addVB: function(e) {
+ e.preventDefault();
+ e.stopPropagation();
+
+ if( this.vertragsbestandteiltyp === '') {
+ return;
+ }
+
+ var vbid = uuid.get_uuid();
+ this.store.addVB(vbid, {
+ type: this.vertragsbestandteiltyp,
+ guioptions: {
+ id: vbid,
+ removeable: true
+ }
+ });
+ this.children.push(vbid);
+ },
+ removeVB: function(payload) {
+ this.store.removeVB(payload.id);
+ var children = this.children.filter(function(vbid) {
+ return vbid !== payload.id;
+ });
+ this.children = children;
+ },
+ getPayload: function() {
+ this.payload = {
+ type: 'vertragsbestandteillist',
+ guioptions: {
+ title: this.title,
+ vertragsbestandteiltyp: this.vertragsbestandteiltyp
+ },
+ children: JSON.parse(JSON.stringify(this.children))
+ };
+ this.updateVBsInStore();
+ return this.payload;
+ },
+ updateVBsInStore: function() {
+ for( var id in this.$refs.parts) {
+ var payload = this.$refs.parts[id].getPayload();
+ this.store.addVB(this.$refs.parts[id].config.guioptions.id, payload);
+ }
+ },
+ getChildren: function() {
+ var vbs = [];
+ var that = this;
+
+ for( var i in this.children ) {
+ var uuid = this.children[i];
+ vbs.push(that.store.getVB(uuid));
+ }
+
+ return vbs;
+ }
+ }
+}
diff --git a/public/js/helpers/vbform/uuid.js b/public/js/helpers/vbform/uuid.js
index d8df0c103..8ebc6a882 100644
--- a/public/js/helpers/vbform/uuid.js
+++ b/public/js/helpers/vbform/uuid.js
@@ -1,4 +1,5 @@
export default {
+ _uuidsbyname: {},
get_uuid: function() {
var uuidValue = "", k, randomValue;
for (k = 0; k < 32; k++) {
@@ -10,5 +11,11 @@ export default {
uuidValue += (k == 12 ? 4 : (k == 16 ? (randomValue & 3 | 8) : randomValue)).toString(16);
}
return uuidValue;
+ },
+ get_uuidbyname: function(name) {
+ if( this._uuidsbyname[name] === undefined ) {
+ this._uuidsbyname[name] = this.get_uuid();
+ }
+ return this._uuidsbyname[name];
}
}
diff --git a/public/js/mixins/vbform/configurable.js b/public/js/mixins/vbform/configurable.js
index 1ba095289..3e69ae90e 100644
--- a/public/js/mixins/vbform/configurable.js
+++ b/public/js/mixins/vbform/configurable.js
@@ -20,7 +20,8 @@ export default {
? true : this.config.guioptions.canhavegehaltsbestandteile;
},
getgehaltsbestandteile: function() {
- return (this.config?.gbs !== undefined) ? this.config.gbs : [];
+ var gbs = (this.config?.gbs !== undefined) ? this.config.gbs : [];
+ return { children: gbs };
},
getgueltigkeit: function() {
if( this.config?.gueltigkeit !== undefined ) {
diff --git a/public/js/mixins/vbform/presetable.js b/public/js/mixins/vbform/presetable.js
index 01612f09b..cfad85be3 100644
--- a/public/js/mixins/vbform/presetable.js
+++ b/public/js/mixins/vbform/presetable.js
@@ -8,13 +8,13 @@ export default {
}
},
created: function() {
- this.children = JSON.parse(JSON.stringify(this.preset));
+ this.children = JSON.parse(JSON.stringify(this.preset.children));
},
watch: {
preset: function() {
this.children = [];
this.$nextTick(function() {
- this.children = JSON.parse(JSON.stringify(this.preset));
+ this.children = JSON.parse(JSON.stringify(this.preset.children));
});
}
}