diff --git a/src/helpers/quillConfig.ts b/src/helpers/quillConfig.ts index 4761b98..458e93b 100644 --- a/src/helpers/quillConfig.ts +++ b/src/helpers/quillConfig.ts @@ -1,6 +1,6 @@ export const toolbarOptions = [ - [{ header: [1, 2, false] }, { font: [] }], - [{ header: 1 }, { header: 2 }], + [/*{ header: [1, 2, false] },*/ { font: [] }], + //[{ header: 1 }, { header: 2 }], ["bold", "italic", "underline", "strike"], ["blockquote", "code-block", "link"], [{ list: "ordered" }, { list: "bullet" }, { list: "check" }], diff --git a/src/stores/admin/protocol.ts b/src/stores/admin/protocol.ts index 3c637d8..2cc13b4 100644 --- a/src/stores/admin/protocol.ts +++ b/src/stores/admin/protocol.ts @@ -97,6 +97,7 @@ export const useProtocolStore = defineStore("protocol", { this.fetchProtocolById(this.origin.id) .then((res) => { this.origin = res.data; + if (this.detectedChangeProtocol) this.syncingProtocol = "detectedChanges"; }) .catch((err) => {}); }, diff --git a/src/stores/admin/protocolAgenda.ts b/src/stores/admin/protocolAgenda.ts index 9d5d9ba..b8852db 100644 --- a/src/stores/admin/protocolAgenda.ts +++ b/src/stores/admin/protocolAgenda.ts @@ -49,7 +49,7 @@ export const useProtocolAgendaStore = defineStore("protocolAgenda", { .post(`/admin/protocol/${protocolId}/agenda`) .then((res) => { this.agenda.push({ - id: res.data, + id: Number(res.data), topic: "", context: "", protocolId: Number(protocolId), @@ -74,6 +74,7 @@ export const useProtocolAgendaStore = defineStore("protocolAgenda", { this.fetchProtocolAgendaPromise() .then((res) => { this.origin = res.data; + if (this.detectedChangeProtocolAgenda) this.syncingProtocolAgenda = "detectedChanges"; }) .catch((err) => {}); }, diff --git a/src/stores/admin/protocolDecision.ts b/src/stores/admin/protocolDecision.ts index 0e291f2..cbfab27 100644 --- a/src/stores/admin/protocolDecision.ts +++ b/src/stores/admin/protocolDecision.ts @@ -50,7 +50,7 @@ export const useProtocolDecisionStore = defineStore("protocolDecision", { .post(`/admin/protocol/${protocolId}/decision`) .then((res) => { this.decision.push({ - id: res.data, + id: Number(res.data), topic: "", context: "", protocolId: Number(protocolId), @@ -75,6 +75,7 @@ export const useProtocolDecisionStore = defineStore("protocolDecision", { this.fetchProtocolDecisionPromise() .then((res) => { this.origin = res.data; + if (this.detectedChangeProtocolDecision) this.syncingProtocolDecision = "detectedChanges"; }) .catch((err) => {}); }, diff --git a/src/stores/admin/protocolPresence.ts b/src/stores/admin/protocolPresence.ts index 5035bd9..6bf9e36 100644 --- a/src/stores/admin/protocolPresence.ts +++ b/src/stores/admin/protocolPresence.ts @@ -58,6 +58,7 @@ export const useProtocolPresenceStore = defineStore("protocolPresence", { this.fetchProtocolPresencePromise() .then((result) => { this.origin = result.data.map((d: ProtocolPresenceViewModel) => d.memberId); + if (this.detectedChangeProtocolPresence) this.syncingProtocolPresence = "detectedChanges"; }) .catch((err) => {}); }, diff --git a/src/stores/admin/protocolVoting.ts b/src/stores/admin/protocolVoting.ts index 225e74e..cc19577 100644 --- a/src/stores/admin/protocolVoting.ts +++ b/src/stores/admin/protocolVoting.ts @@ -50,7 +50,7 @@ export const useProtocolVotingStore = defineStore("protocolVoting", { .post(`/admin/protocol/${protocolId}/voting`) .then((res) => { this.voting.push({ - id: res.data, + id: Number(res.data), topic: "", context: "", favour: 0, @@ -78,6 +78,7 @@ export const useProtocolVotingStore = defineStore("protocolVoting", { this.fetchProtocolVotingPromise() .then((res) => { this.origin = res.data; + if (this.detectedChangeProtocolVoting) this.syncingProtocolVoting = "detectedChanges"; }) .catch((err) => {}); }, diff --git a/src/views/admin/club/protocol/ProtocolOverview.vue b/src/views/admin/club/protocol/ProtocolOverview.vue index 91eaf8d..6249775 100644 --- a/src/views/admin/club/protocol/ProtocolOverview.vue +++ b/src/views/admin/club/protocol/ProtocolOverview.vue @@ -12,11 +12,11 @@