From 744f792b97c52f9f6b38877ab5179b71b424f93b Mon Sep 17 00:00:00 2001 From: franck Date: Tue, 26 Mar 2024 15:23:48 +0100 Subject: [PATCH] Ajout mock liste des membres d'un process --- src/services.ts | 52 +++++++++++++++++++-------------------- src/store/processstore.ts | 8 +++--- 2 files changed, 29 insertions(+), 31 deletions(-) diff --git a/src/services.ts b/src/services.ts index 25f36b1..980e861 100644 --- a/src/services.ts +++ b/src/services.ts @@ -48,16 +48,18 @@ class Services { } - public async isNewUser(): Promise { + public async isNewUser(): Promise { let isNew = false; try { - let listUserProcess = await Services.instance.getAllUserProcess(); - if (listUserProcess.length == 0) { + const indexedDB = await IndexedDB.getInstance(); + const db = indexedDB.getDb(); + let userListObject = await indexedDB.getAll(db, indexedDB.getStoreList().AnkUser); + if (userListObject.length == 0) { isNew = true; } } catch (error) { console.error("Failed to retrieve isNewUser :", error); - } + } return isNew; } @@ -65,7 +67,7 @@ class Services { Services.instance.injectHtml(Services.instance.get_html_create_id()); Services.instance.attachSubmitListener("form4nk", Services.instance.createId); Services.instance.attachClickListener("displayrecover", Services.instance.displayRecover); - Services.instance.displayProcess(await Services.instance.getAllProcessAvailable()); + Services.instance.displayProcess(await Services.instance.getAllProcess()); } public get_html_create_id(): string { @@ -89,7 +91,7 @@ class Services { // To comment if test if (!Services.instance.isPasswordValid(password)) return; - const image_to_recover = Services.instance.getImage("assets/4nk_image.jpeg"); + const image_to_recover = Services.instance.getImage("assets/4nk_image.png"); const image_to_revoke = Services.instance.getImage("assets/revoke.jpeg"); let label = null; let birthday = 50000; @@ -204,7 +206,6 @@ class Services { let body = ""; let style = ""; let script = ""; - let inputName = ""; try { const indexedDB = await IndexedDB.getInstance(); const db = indexedDB.getDb(); @@ -213,7 +214,6 @@ class Services { body = processObject.html; style = processObject.style; script = processObject.script; - inputName = processObject.inputName; } catch (error) { console.log("JS Processstore not exist "); } @@ -221,11 +221,11 @@ class Services { console.error("Failed to retrieve user object :", error); } - Services.instance.injectUpdateAnIdHtml(body, style, script, inputName); + Services.instance.injectUpdateAnIdHtml(body, style, script); Services.instance.attachSubmitListener("form4nk", Services.instance.updateAnId); } - public injectUpdateAnIdHtml(bodyToInject: string, styleToInject: string, scriptToInject: string, inputName: string) { + public injectUpdateAnIdHtml(bodyToInject: string, styleToInject: string, scriptToInject: string) { console.log("JS html : "+bodyToInject); const body = document.getElementsByTagName('body')[0]; @@ -258,6 +258,8 @@ class Services { console.log("JS updateAnId submit "); // TODO alert("updateAnId submit to do ... Name : "+firstName.value + " "+lastName.value); + + // TODO Mock add user member to process } public displayProcess(processList: string[]): void { @@ -272,33 +274,29 @@ class Services { }) } } - + public async getAllUserProcess(): Promise { let userProcessList: string[] = []; try { const indexedDB = await IndexedDB.getInstance(); const db = indexedDB.getDb(); - let userListObject = await indexedDB.getAll(db, indexedDB.getStoreList().AnkUser); - userListObject.forEach(async (userObject) => { - // TODO get processname - //const processName = userObject.process; - const processName = "process1"; - userProcessList.push(processName); - console.log("JS User found"); + let processListObject = await indexedDB.getAll(db, indexedDB.getStoreList().AnkProcess); + processListObject.forEach(async (processObject) => { + const listMember = processObject.listMember; + const processName = processObject.process; + listMember.forEach(async (member) => { + if (member == "user1") { + userProcessList.push(processName); + console.log("JS UserProcess found"); + } + }) }) } catch (error) { - console.log("JS User not found"); - } + console.log("JS Processstore not found"); + } return userProcessList; } - public async getAllProcessAvailable(): Promise { - let userProcessList = await Services.instance.getAllUserProcess(); - let processList = await Services.instance.getAllProcess(); - let availableProcessList = processList.filter(x => !userProcessList.includes(x)); - return availableProcessList; - } - public async getAllProcess(): Promise { // if indexedDB is empty, get list from wasm let processList: string[] = []; diff --git a/src/store/processstore.ts b/src/store/processstore.ts index 39cabee..76eb6b5 100644 --- a/src/store/processstore.ts +++ b/src/store/processstore.ts @@ -3,7 +3,7 @@ class Processstore { html: string; style: string; script: string; - inputName: string; + listMember: string[]; createDate: Date; constructor() { @@ -12,7 +12,7 @@ class Processstore { this.style = getMockStyle(); this.script = getMockScript(); this.script = getMockScript(); - this.inputName = getMockinputName(); + this.listMember = getMockListMember(); this.createDate = new Date; } } @@ -232,6 +232,6 @@ function getMockScript(): string { return script; } -function getMockinputName(): string { - return "firstName"; +function getMockListMember(): string[] { + return ["user1","user2","user3"]; } \ No newline at end of file