From 181138d21db0f9fcaa76105a85ece316c66be5bd Mon Sep 17 00:00:00 2001 From: powerzenbob Date: Tue, 30 Nov 2021 15:22:22 +0100 Subject: [PATCH 1/5] onboarding process setup --- docu/onboarding_process.odt | Bin 0 -> 2952 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 docu/onboarding_process.odt diff --git a/docu/onboarding_process.odt b/docu/onboarding_process.odt new file mode 100644 index 0000000000000000000000000000000000000000..bd25a7c2e3dee7352c6878fc6ebc510963dd0820 GIT binary patch literal 2952 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 literal 0 HcmV?d00001 From 5959146073c18c3e6d59a9b8a106242f8265fb10 Mon Sep 17 00:00:00 2001 From: powerzenbob Date: Tue, 30 Nov 2021 19:20:15 +0100 Subject: [PATCH 2/5] file format changed to md --- docu/onboarding_process.md | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 docu/onboarding_process.md diff --git a/docu/onboarding_process.md b/docu/onboarding_process.md new file mode 100644 index 000000000..767dd54e1 --- /dev/null +++ b/docu/onboarding_process.md @@ -0,0 +1,25 @@ +# Onboarding process +## Meeting with Bernd (zoom) +## Meeting with Claus-Peter and perhaps concerning team member (zoom) +## Presentation to all team members (discord) +## Grant access to +- Nextcloud server +- Add to github repository (create github account if not available) +## Start working +- install docker desktop +- install git: https://git-scm.com/book/de/v2/Erste-Schritte-Git-installieren +- add new ssh key: https://docs.github.com/en/authentication/connecting-to-github-with-ssh/adding-a-new-ssh-key-to-your-github-account +- download gradido repository: git clone git@github.com:gradido/gradido.git --recursive +- install visual studio code +- docker-compose build +- docker-compose up +http://localhost/vue should be same as https://gdd1.gradido.com/vue + +##git basics to update this document +- git status +- git branch onboarding_process +- git checkout onboarding_process +- git add onboarding_process.md +- git commit +- git push +- git push --set-upstream origin onboarding_process From 9ca497255d7df0c6b09b1b16be5ed9c807d4d0e5 Mon Sep 17 00:00:00 2001 From: powerzenbob Date: Tue, 30 Nov 2021 19:39:01 +0100 Subject: [PATCH 3/5] udate --- docu/onboarding_process.md | 2 +- docu/onboarding_process.odt | Bin 2952 -> 0 bytes 2 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 docu/onboarding_process.odt diff --git a/docu/onboarding_process.md b/docu/onboarding_process.md index 767dd54e1..8b748a33f 100644 --- a/docu/onboarding_process.md +++ b/docu/onboarding_process.md @@ -15,7 +15,7 @@ - docker-compose up http://localhost/vue should be same as https://gdd1.gradido.com/vue -##git basics to update this document +## git basics to update this document - git status - git branch onboarding_process - git checkout onboarding_process diff --git a/docu/onboarding_process.odt b/docu/onboarding_process.odt deleted file mode 100644 index bd25a7c2e3dee7352c6878fc6ebc510963dd0820..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2952 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 From 4c098b0124d97c3574887bf28480ec79011b861d Mon Sep 17 00:00:00 2001 From: elweyn Date: Wed, 12 Jan 2022 10:39:22 +0100 Subject: [PATCH 4/5] Withdrew space at the end of an locale definition. --- admin/src/locales/de.json | 2 +- admin/src/locales/en.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json index 471f9626d..58f7b6714 100644 --- a/admin/src/locales/de.json +++ b/admin/src/locales/de.json @@ -2,7 +2,7 @@ "bookmark": "bookmark", "confirmed": "bestätigt", "creation_form": { - "creation_for": "Schöpfung für ", + "creation_for": "Schöpfung für", "enter_text": "Text eintragen", "form": "Schöpfungsformular", "min_characters": "Mindestens 10 Zeichen eingeben", diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json index 6bbc6bd57..a02782267 100644 --- a/admin/src/locales/en.json +++ b/admin/src/locales/en.json @@ -2,7 +2,7 @@ "bookmark": "Remember", "confirmed": "confirmed", "creation_form": { - "creation_for": "Creation for ", + "creation_for": "Creation for", "enter_text": "Enter text", "form": "Creation form", "min_characters": "Enter at least 10 characters", From 06fdbf863ee59128f7642ceab4f669eb85402e58 Mon Sep 17 00:00:00 2001 From: elweyn Date: Wed, 12 Jan 2022 11:36:36 +0100 Subject: [PATCH 5/5] Fix removing from masscreationlist now gives right item to the left list. --- admin/src/pages/Creation.spec.js | 22 +++++++++++----------- admin/src/pages/Creation.vue | 8 ++++---- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/admin/src/pages/Creation.spec.js b/admin/src/pages/Creation.spec.js index cad0b9ba3..fc8cdbaf0 100644 --- a/admin/src/pages/Creation.spec.js +++ b/admin/src/pages/Creation.spec.js @@ -8,14 +8,14 @@ const apolloQueryMock = jest.fn().mockResolvedValue({ data: { searchUsers: [ { - id: 1, + userId: 1, firstName: 'Bibi', lastName: 'Bloxberg', email: 'bibi@bloxberg.de', creation: [200, 400, 600], }, { - id: 2, + userId: 2, firstName: 'Benjamin', lastName: 'Blümchen', email: 'benjamin@bluemchen.de', @@ -71,7 +71,7 @@ describe('Creation', () => { it('sets the data of itemsList', () => { expect(wrapper.vm.itemsList).toEqual([ { - id: 1, + userId: 1, firstName: 'Bibi', lastName: 'Bloxberg', email: 'bibi@bloxberg.de', @@ -79,7 +79,7 @@ describe('Creation', () => { showDetails: false, }, { - id: 2, + userId: 2, firstName: 'Benjamin', lastName: 'Blümchen', email: 'benjamin@bluemchen.de', @@ -100,7 +100,7 @@ describe('Creation', () => { wrapper.findComponent({ name: 'UserTable' }).vm.$emit( 'update-item', { - id: 2, + userId: 2, firstName: 'Benjamin', lastName: 'Blümchen', email: 'benjamin@bluemchen.de', @@ -114,7 +114,7 @@ describe('Creation', () => { it('removes the pushed item from itemsList', () => { expect(wrapper.vm.itemsList).toEqual([ { - id: 1, + userId: 1, firstName: 'Bibi', lastName: 'Bloxberg', email: 'bibi@bloxberg.de', @@ -127,7 +127,7 @@ describe('Creation', () => { it('adds the pushed item to itemsMassCreation', () => { expect(wrapper.vm.itemsMassCreation).toEqual([ { - id: 2, + userId: 2, firstName: 'Benjamin', lastName: 'Blümchen', email: 'benjamin@bluemchen.de', @@ -142,7 +142,7 @@ describe('Creation', () => { wrapper.findComponent({ name: 'UserTable' }).vm.$emit( 'update-item', { - id: 2, + userId: 2, firstName: 'Benjamin', lastName: 'Blümchen', email: 'benjamin@bluemchen.de', @@ -160,7 +160,7 @@ describe('Creation', () => { it('adds the item to itemsList', () => { expect(wrapper.vm.itemsList).toEqual([ { - id: 1, + userId: 1, firstName: 'Bibi', lastName: 'Bloxberg', email: 'bibi@bloxberg.de', @@ -168,7 +168,7 @@ describe('Creation', () => { showDetails: false, }, { - id: 2, + userId: 2, firstName: 'Benjamin', lastName: 'Blümchen', email: 'benjamin@bluemchen.de', @@ -206,7 +206,7 @@ describe('Creation', () => { await wrapper.findComponent({ name: 'UserTable' }).vm.$emit( 'update-item', { - id: 2, + userId: 2, firstName: 'Benjamin', lastName: 'Blümchen', email: 'benjamin@bluemchen.de', diff --git a/admin/src/pages/Creation.vue b/admin/src/pages/Creation.vue index 4fabc064a..65e0b2f2f 100644 --- a/admin/src/pages/Creation.vue +++ b/admin/src/pages/Creation.vue @@ -133,16 +133,16 @@ export default { switch (event) { case 'push': - findArr = this.itemsList.find((arr) => arr.id === e.id) + findArr = this.itemsList.find((item) => e.userId === item.userId) index = this.itemsList.indexOf(findArr) this.itemsList.splice(index, 1) - this.itemsMassCreation.push(e) + this.itemsMassCreation.push(findArr) break case 'remove': - findArr = this.itemsMassCreation.find((arr) => arr.id === e.id) + findArr = this.itemsMassCreation.find((item) => e.userId === item.userId) index = this.itemsMassCreation.indexOf(findArr) this.itemsMassCreation.splice(index, 1) - this.itemsList.push(e) + this.itemsList.push(findArr) break default: throw new Error(event)