verteilen-core 1.3.18 → 1.3.20

package/dist/lan/en.json

@@ -133,6 +133,8 @@
         "delete-template": "Delete Template",
         "delete-plugin-confirm": "Are you sure delete plugin you selected",
         "delete-template-confirm": "Are you sure delete template you selected",
+        "job-title": "Job Title",
+        "job-description": "Job Description",
         "delete-job": "Delete Job",
         "delete-job-confirm": "Are you sure you want to delete this job?",
         "delete-task": "Delete Task",

package/dist/lan/zh_TW.json

@@ -133,6 +133,8 @@
         "delete-template": "刪除樣板",
         "delete-plugin-confirm": "確定刪除選取的插件嗎?",
         "delete-template-confirm": "確定刪除選取的樣板嗎?",
+        "job-title": "工作標題",
+        "job-description": "工作敘述",
         "delete-job": "刪除工作",
         "delete-job-confirm": "確定刪除選取的工作嗎?",
         "delete-task": "刪除流程",

package/dist/plugins/i18n.d.ts

@@ -141,6 +141,8 @@ export declare const i18nDefaultData: {
                 "delete-template": string;
                 "delete-plugin-confirm": string;
                 "delete-template-confirm": string;
+                "job-title": string;
+                "job-description": string;
                 "delete-job": string;
                 "delete-job-confirm": string;
                 "delete-task": string;
@@ -560,6 +562,8 @@ export declare const i18nDefaultData: {
                 "delete-template": string;
                 "delete-plugin-confirm": string;
                 "delete-template-confirm": string;
+                "job-title": string;
+                "job-description": string;
                 "delete-job": string;
                 "delete-job-confirm": string;
                 "delete-task": string;
@@ -982,6 +986,8 @@ export declare const i18n: import("vue-i18n").I18n<{
             "delete-template": string;
             "delete-plugin-confirm": string;
             "delete-template-confirm": string;
+            "job-title": string;
+            "job-description": string;
             "delete-job": string;
             "delete-job-confirm": string;
             "delete-task": string;
@@ -1401,6 +1407,8 @@ export declare const i18n: import("vue-i18n").I18n<{
             "delete-template": string;
             "delete-plugin-confirm": string;
             "delete-template-confirm": string;
+            "job-title": string;
+            "job-description": string;
             "delete-job": string;
             "delete-job-confirm": string;
             "delete-task": string;

package/dist/server/module/project.d.ts

@@ -6,9 +6,10 @@ export declare class Project_Module {
     constructor(memory: Server);
     get memory(): MemoryData;
     get loader(): RecordLoader;
-    ProjectJobCount(uuid: string): number;
-    PopulateProject(uuid: string): Project | undefined;
-    PopulateTask(uuid: string): Task | undefined;
+    ProjectJobCount(uuid: string): Promise<number>;
+    ReOrderProjectTask(uuid: string, uuids: Array<string>): Promise<void>;
+    PopulateProject(uuid: string): Promise<Project | undefined>;
+    PopulateTask(uuid: string): Promise<Task | undefined>;
     GetProjectRelatedTask(uuid: string): Promise<Array<Task>>;
     GetTaskRelatedJob(uuid: string): Promise<Array<Job>>;
     CloneProjects(uuids: Array<string>): Promise<Array<string>>;

package/dist/server/module/project.js

@@ -9,7 +9,8 @@ class Project_Module {
     }
     get memory() { return this.server.memory; }
     get loader() { return this.server.current_loader; }
-    ProjectJobCount(uuid) {
+    async ProjectJobCount(uuid) {
+        await this.loader.project.load(uuid, true);
         const p = this.memory.projects.find(p => p.uuid == uuid);
         if (!p)
             return 0;
@@ -17,58 +18,63 @@ class Project_Module {
         const counts = t.map(x => x.jobs_uuid.length);
         return counts.reduce((a, b) => a + b, 0);
     }
-    PopulateProject(uuid) {
+    async ReOrderProjectTask(uuid, uuids) {
+        await this.loader.project.load(uuid, true);
+        const p = this.memory.projects.find(p => p.uuid == uuid);
+        if (!p)
+            return;
+        p.tasks_uuid = uuids;
+        this.loader.project.save(uuid, JSON.stringify(p, null, 4));
+    }
+    async PopulateProject(uuid) {
+        await this.loader.project.load(uuid, true);
         const p = this.memory.projects.find(p => p.uuid == uuid);
         if (!p)
             return undefined;
         const buffer = Object.assign({}, p);
-        for (var x of buffer.tasks_uuid) {
-            const t = this.PopulateTask(x);
-            if (!t)
-                return undefined;
-            buffer.tasks.push(t);
-        }
+        const ts = buffer.tasks_uuid.map(x => this.PopulateTask(x));
+        buffer.tasks = (await Promise.all(ts)).filter(x => x != undefined);
         return buffer;
     }
-    PopulateTask(uuid) {
+    async PopulateTask(uuid) {
+        await this.loader.task.load(uuid, false);
         const p = this.memory.tasks.find(p => p.uuid == uuid);
         if (!p)
             return undefined;
         const buffer = Object.assign({}, p);
-        for (var x of buffer.jobs_uuid) {
-            const t = this.memory.jobs.find(t => t.uuid == x);
-            if (!t)
-                return undefined;
-            buffer.jobs.push(t);
-        }
+        const js = buffer.jobs_uuid.map(async (x) => {
+            await this.loader.job.load(uuid, false);
+            return this.memory.jobs.find(t => t.uuid == x);
+        });
+        buffer.jobs = (await Promise.all(js)).filter(x => x != undefined);
         return buffer;
     }
     async GetProjectRelatedTask(uuid) {
-        await this.loader.project.load(uuid, true);
+        await this.loader.project.load(uuid, false);
         const p = this.memory.projects.find(x => x.uuid == uuid);
         if (!p)
             return [];
         const r = p.tasks_uuid.map(x => {
-            return this.loader.task.load(x, true);
+            return this.loader.task.load(x, false);
         });
         await Promise.all(r);
         const tasks = p.tasks_uuid.map(x => this.memory.tasks.find(y => y.uuid == x)).filter(x => x != undefined);
         return tasks;
     }
     async GetTaskRelatedJob(uuid) {
-        await this.loader.task.load(uuid, true);
+        await this.loader.task.load(uuid, false);
         const p = this.memory.tasks.find(x => x.uuid == uuid);
         if (!p)
             return [];
         const r = p.jobs_uuid.map(x => {
-            return this.loader.job.load(x, true);
+            return this.loader.job.load(x, false);
         });
         await Promise.all(r);
         const jobs = p.jobs_uuid.map(x => this.memory.jobs.find(y => y.uuid == x)).filter(x => x != undefined);
         return jobs;
     }
     async CloneProjects(uuids) {
-        const p = uuids.map(x => this.loader.project.load(x, true));
+        const p = uuids.map(x => this.loader.project.load(x, false));
         const ps = await Promise.all(p);
         const projects = ps.map(x => JSON.parse(x));
         projects.forEach((x, i) => x.uuid = (0, uuid_1.v6)({}, undefined, i));
@@ -82,7 +88,7 @@ class Project_Module {
         return projects.map(x => x.uuid);
     }
     async CloneTasks(uuids) {
-        const p = uuids.map(x => this.loader.task.load(x, true));
+        const p = uuids.map(x => this.loader.task.load(x, false));
         const ps = await Promise.all(p);
         const tasks = ps.map(x => JSON.parse(x));
         tasks.forEach((x, i) => x.uuid = (0, uuid_1.v6)({}, undefined, 2500 + i));
@@ -96,7 +102,7 @@ class Project_Module {
         return tasks.map(x => x.uuid);
     }
     async CloneJobs(uuids) {
-        const p = uuids.map(x => this.loader.job.load(x, true));
+        const p = uuids.map(x => this.loader.job.load(x, false));
         const ps = await Promise.all(p);
         const jobs = ps.map(x => JSON.parse(x));
         jobs.forEach((x, i) => x.uuid = (0, uuid_1.v6)({}, undefined, 5000 + i));
@@ -105,7 +111,7 @@ class Project_Module {
         return jobs.map(x => x.uuid);
     }
     async CascadeDeleteProject(uuid, bind) {
-        await this.loader.project.load(uuid, true);
+        await this.loader.project.load(uuid, false);
         const p = this.memory.projects.find(p => p.uuid == uuid);
         if (!p)
             return;
@@ -117,7 +123,7 @@ class Project_Module {
             await this.Delete_Database_Idle(db);
     }
     async CascadeDeleteTask(uuid) {
-        await this.loader.task.load(uuid, true);
+        await this.loader.task.load(uuid, false);
         const p = this.memory.tasks.find(p => p.uuid == uuid);
         if (!p)
             return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "verteilen-core",
-  "version": "1.3.18",
+  "version": "1.3.20",
   "license": "MIT",
   "homepage": "https://verteilen.github.io/wiki/",
   "author": "Elly",

package/src/lan/en.json

@@ -133,6 +133,8 @@
         "delete-template": "Delete Template",
         "delete-plugin-confirm": "Are you sure delete plugin you selected",
         "delete-template-confirm": "Are you sure delete template you selected",
+        "job-title": "Job Title",
+        "job-description": "Job Description",
         "delete-job": "Delete Job",
         "delete-job-confirm": "Are you sure you want to delete this job?",
         "delete-task": "Delete Task",

package/src/lan/zh_TW.json

@@ -133,6 +133,8 @@
         "delete-template": "刪除樣板",
         "delete-plugin-confirm": "確定刪除選取的插件嗎?",
         "delete-template-confirm": "確定刪除選取的樣板嗎?",
+        "job-title": "工作標題",
+        "job-description": "工作敘述",
         "delete-job": "刪除工作",
         "delete-job-confirm": "確定刪除選取的工作嗎?",
         "delete-task": "刪除流程",

package/src/server/module/project.ts

@@ -18,42 +18,49 @@ export class Project_Module {
     public get memory(): MemoryData { return this.server.memory }
     public get loader(): RecordLoader { return this.server.current_loader }
 
-    ProjectJobCount(uuid:string):number {
+    async ProjectJobCount(uuid:string):Promise<number> {
+        await this.loader.project.load(uuid, true)
         const p:Project | undefined = this.memory.projects.find(p=> p.uuid == uuid)
         if(!p) return 0
         const t:Array<Task> = p.tasks_uuid.map(t_uuid => this.memory.tasks.find(t => t.uuid == t_uuid)).filter(t => t != undefined)
         const counts = t.map(x => x.jobs_uuid.length)
         return counts.reduce((a,b) => a + b, 0)
     }
+    async ReOrderProjectTask(uuid:string, uuids:Array<string>):Promise<void> {
+        await this.loader.project.load(uuid, true)
+        const p:Project | undefined = this.memory.projects.find(p=> p.uuid == uuid)
+        if(!p) return
+        p.tasks_uuid = uuids
+        this.loader.project.save(uuid, JSON.stringify(p, null, 4))
+    }
 
     /**
      * Assign real data to instance
      * @param uuid Project UUID
      */
-    PopulateProject(uuid:string):Project | undefined {
+    async PopulateProject(uuid:string):Promise<Project | undefined> {
+        await this.loader.project.load(uuid, true)
         const p:Project | undefined = this.memory.projects.find(p=> p.uuid == uuid)
         if(!p) return undefined
         const buffer:Project = Object.assign({}, p) as Project
-        for(var x of buffer.tasks_uuid){
-            const t:Task | undefined = this.PopulateTask(x)
-            if(!t) return undefined
-            buffer.tasks.push(t)
-        }
+        const ts = buffer.tasks_uuid.map(x => this.PopulateTask(x))
+        buffer.tasks = (await Promise.all(ts)).filter(x => x != undefined)
         return buffer
     }
     /**
      * Assign real data to instance
      * @param uuid Task UUID
      */
-    PopulateTask(uuid:string):Task | undefined {
+    async PopulateTask(uuid:string):Promise<Task | undefined> {
+        await this.loader.task.load(uuid, false)
         const p:Task | undefined = this.memory.tasks.find(p=> p.uuid == uuid)
         if(!p) return undefined
         const buffer:Task = Object.assign({}, p) as Task
-        for(var x of buffer.jobs_uuid){
-            const t:Job | undefined = this.memory.jobs.find(t => t.uuid == x)
-            if(!t) return undefined
-            buffer.jobs.push(t)
-        }
+        const js = buffer.jobs_uuid.map(async x => {
+            await this.loader.job.load(uuid, false)
+            return this.memory.jobs.find(t => t.uuid == x)
+        })
+        buffer.jobs = (await Promise.all(js)).filter(x => x != undefined)
         return buffer
     }
     /**
@@ -62,11 +69,11 @@ export class Project_Module {
      * @returns Related Tasks
      */
     async GetProjectRelatedTask(uuid:string):Promise<Array<Task>> {
-        await this.loader.project.load(uuid, true)
+        await this.loader.project.load(uuid, false)
         const p = this.memory.projects.find(x => x.uuid == uuid)
         if(!p) return []
         const r = p.tasks_uuid.map(x => {
-            return this.loader.task.load(x, true)
+            return this.loader.task.load(x, false)
         })
         await Promise.all(r)
         const tasks = p.tasks_uuid.map(x => this.memory.tasks.find(y => y.uuid == x)).filter(x => x != undefined)
@@ -78,11 +85,11 @@ export class Project_Module {
      * @returns Related Jobs
      */
     async GetTaskRelatedJob(uuid:string):Promise<Array<Job>> {
-        await this.loader.task.load(uuid, true)
+        await this.loader.task.load(uuid, false)
         const p = this.memory.tasks.find(x => x.uuid == uuid)
         if(!p) return []
         const r = p.jobs_uuid.map(x => {
-            return this.loader.job.load(x, true)
+            return this.loader.job.load(x, false)
         })
         await Promise.all(r)
         const jobs = p.jobs_uuid.map(x => this.memory.jobs.find(y => y.uuid == x)).filter(x => x != undefined)
@@ -94,7 +101,7 @@ export class Project_Module {
      * @returns The new uuids list
      */
     async CloneProjects(uuids:Array<string>):Promise<Array<string>>{
-        const p = uuids.map(x => this.loader.project.load(x, true))
+        const p = uuids.map(x => this.loader.project.load(x, false))
         const ps = await Promise.all(p)
         const projects:Array<Project> = ps.map(x => JSON.parse(x))
         projects.forEach((x, i) => x.uuid = uuidv6({}, undefined, i))
@@ -113,7 +120,7 @@ export class Project_Module {
      * @returns The new uuids list
      */
     async CloneTasks(uuids:Array<string>):Promise<Array<string>>{
-        const p = uuids.map(x => this.loader.task.load(x, true))
+        const p = uuids.map(x => this.loader.task.load(x, false))
         const ps = await Promise.all(p)
         const tasks:Array<Task> = ps.map(x => JSON.parse(x))
         tasks.forEach((x, i) => x.uuid = uuidv6({}, undefined, 2500 + i))
@@ -132,7 +139,7 @@ export class Project_Module {
      * @returns The new uuids list
      */
     async CloneJobs(uuids:Array<string>):Promise<Array<string>>{
-        const p = uuids.map(x => this.loader.job.load(x, true))
+        const p = uuids.map(x => this.loader.job.load(x, false))
         const ps = await Promise.all(p)
         const jobs:Array<Job> = ps.map(x => JSON.parse(x))
         jobs.forEach((x, i) => x.uuid = uuidv6({}, undefined, 5000 + i))
@@ -145,7 +152,7 @@ export class Project_Module {
      * @param uuid Project UUID
      */
     async CascadeDeleteProject(uuid:string, bind:boolean):Promise<void>{
-        await this.loader.project.load(uuid, true)
+        await this.loader.project.load(uuid, false)
         const p:Project = this.memory.projects.find(p=> p.uuid == uuid)!
         if(!p) return
         const ps = p.tasks_uuid.map(t_uuid => this.CascadeDeleteTask(t_uuid))
@@ -159,7 +166,7 @@ export class Project_Module {
      * @param uuid Task UUID
      */
     async CascadeDeleteTask(uuid:string):Promise<void>{
-        await this.loader.task.load(uuid, true)
+        await this.loader.task.load(uuid, false)
         const p:Task = this.memory.tasks.find(p=> p.uuid == uuid)!
         if(!p) return
         const ps = p.jobs_uuid.map(j_uuid => this.loader.job.delete(j_uuid))