Skip to content

R
RLG Maker
Commit f53cca10 authored by Romain DELEAU's avatar Romain DELEAU
Browse files
Options

fix move up/down tasks

parent 81137029
Hide whitespace changes
Inline Side-by-side
Showing with 24 additions and 16 deletions
src/app/class/role/role.ts
View file @ f53cca10
...@@ -69,10 +69,10 @@ export class Role { ...@@ -69,10 +69,10 @@ export class Role {
if (this.tasks[i][j]?.type == 'final' || this.tasks[i][j]?.type == 'repeat') { if (this.tasks[i][j]?.type == 'final' || this.tasks[i][j]?.type == 'repeat') {
this.tasks[i][j] = this.tasks[i - 1][this.getLastTaskIndex(i - 1)]; this.tasks[i][j] = this.tasks[i - 1][this.getLastTaskIndex(i - 1)];
this.tasks[i - 1][this.getLastTaskIndex(i - 1)] = tmp; this.tasks[i - 1][this.getLastTaskIndex(i - 1)] = tmp;
} else if (this.thereIsSpace(i - 1, this.getRealIndex(i-1,j), this.tasks[i][j] as Task)) { } else if (this.thereIsSpace(i - 1, this.getDestinationIndexFromRealIndex(this.getRealIndex(i,j), i-1), this.tasks[i][j] as Task)) {
this.tasks[i - 1][this.getRealIndex(i-1,j)] = tmp; this.tasks[i-1][this.getDestinationIndexFromRealIndex(this.getRealIndex(i,j), i-1)] = tmp;
this.tasks[i][j] = null; this.tasks[i][j] = null;
this.tasks[i - 1].splice(this.getRealIndex(i-1,j)+1,tmp?.duration-1); this.tasks[i - 1].splice(this.getDestinationIndexFromRealIndex(this.getRealIndex(i,j), i-1)+1,tmp.duration-1);
for(let index = 1; index < tmp.duration; index++) { for(let index = 1; index < tmp.duration; index++) {
this.tasks[i].splice(j+index,0,null); this.tasks[i].splice(j+index,0,null);
} }
...@@ -82,10 +82,10 @@ export class Role { ...@@ -82,10 +82,10 @@ export class Role {
this.tasks[i - 1][this.getLastTaskIndex(i - 1) + 1] = deplace; this.tasks[i - 1][this.getLastTaskIndex(i - 1) + 1] = deplace;
this.tasks[i][j] = null; this.tasks[i][j] = null;
} }
} else if (this.thereIsSpace(i - 1, this.getRealIndex(i-1,j), this.tasks[i][j] as Task)) { } else if (this.thereIsSpace(i - 1, this.getDestinationIndexFromRealIndex(this.getRealIndex(i,j), i-1), this.tasks[i][j] as Task)) {
this.tasks[i - 1][this.getRealIndex(i-1,j)] = tmp; this.tasks[i-1][this.getDestinationIndexFromRealIndex(this.getRealIndex(i,j), i-1)] = tmp;
this.tasks[i][j] = null; this.tasks[i][j] = null;
this.tasks[i - 1].splice(this.getRealIndex(i-1,j)+1,tmp.duration-1); this.tasks[i - 1].splice(this.getDestinationIndexFromRealIndex(this.getRealIndex(i,j), i-1)+1,tmp.duration-1);
for(let index = 1; index < tmp.duration; index++) { for(let index = 1; index < tmp.duration; index++) {
this.tasks[i].splice(j+index,0,null); this.tasks[i].splice(j+index,0,null);
} }
...@@ -107,10 +107,10 @@ export class Role { ...@@ -107,10 +107,10 @@ export class Role {
if (this.tasks[i][j]?.type == 'final' || this.tasks[i][j]?.type == 'repeat') { if (this.tasks[i][j]?.type == 'final' || this.tasks[i][j]?.type == 'repeat') {
this.tasks[i][j] = this.tasks[i + 1][this.getLastTaskIndex(i + 1)]; this.tasks[i][j] = this.tasks[i + 1][this.getLastTaskIndex(i + 1)];
this.tasks[i + 1][this.getLastTaskIndex(i + 1)] = tmp; this.tasks[i + 1][this.getLastTaskIndex(i + 1)] = tmp;
} else if (this.thereIsSpace(i + 1, this.getRealIndex(i+1,j), this.tasks[i][j] as Task)) { } else if (this.thereIsSpace(i + 1, this.getDestinationIndexFromRealIndex(this.getRealIndex(i,j), i+1), this.tasks[i][j] as Task)) {
this.tasks[i + 1][this.getRealIndex(i+1,j)] = tmp; this.tasks[i+1][this.getDestinationIndexFromRealIndex(this.getRealIndex(i,j), i+1)] = tmp;
this.tasks[i][j] = null; this.tasks[i][j] = null;
this.tasks[i + 1].splice(this.getRealIndex(i+1,j)+1,tmp?.duration-1); this.tasks[i + 1].splice(this.getDestinationIndexFromRealIndex(this.getRealIndex(i,j), i+1)+1,tmp.duration-1);
for(let index = 1; index < tmp.duration; index++) { for(let index = 1; index < tmp.duration; index++) {
this.tasks[i].splice(j+index,0,null); this.tasks[i].splice(j+index,0,null);
} }
...@@ -120,13 +120,13 @@ export class Role { ...@@ -120,13 +120,13 @@ export class Role {
this.tasks[i + 1][this.getLastTaskIndex(i + 1) + 1] = deplace; this.tasks[i + 1][this.getLastTaskIndex(i + 1) + 1] = deplace;
this.tasks[i][j] = null; this.tasks[i][j] = null;
} }
} else if (this.thereIsSpace(i + 1, this.getRealIndex(i+1,j), this.tasks[i][j] as Task)) { } else if (this.thereIsSpace(i + 1, this.getDestinationIndexFromRealIndex(this.getRealIndex(i,j), i+1), this.tasks[i][j] as Task)) {
this.tasks[i + 1][this.getRealIndex(i+1,j)] = tmp; this.tasks[i+1][this.getDestinationIndexFromRealIndex(this.getRealIndex(i,j), i+1)] = tmp;
this.tasks[i][j] = null; this.tasks[i][j] = null;
this.tasks[i + 1].splice(this.getRealIndex(i+1,j)+1,tmp.duration-1); this.tasks[i + 1].splice(this.getDestinationIndexFromRealIndex(this.getRealIndex(i,j), i+1)+1,tmp.duration-1);
for(let index = 1; index < tmp.duration; index++) { for(let index = 1; index < tmp.duration; index++) {
this.tasks[i].splice(j+index,0,null); this.tasks[i].splice(j+index,0,null);
} }
} else { } else {
this.tasks[i + 1][this.getLastTaskIndex(i + 1) + 1] = tmp; this.tasks[i + 1][this.getLastTaskIndex(i + 1) + 1] = tmp;
this.tasks[i][j] = null; this.tasks[i][j] = null;
...@@ -175,6 +175,14 @@ export class Role { ...@@ -175,6 +175,14 @@ export class Role {
return realj; return realj;
} }
getDestinationIndexFromRealIndex(realindex: number, iDest: number): number {
let index: number = 0;
while(this.getRealIndex(iDest, index) < realindex) {
index++;
}
return index;
}
public moveStep(i: number, direction: string): void { public moveStep(i: number, direction: string): void {
let tmp: Step | null = this.chronologie[i]; let tmp: Step | null = this.chronologie[i];
if (direction == 'left') { if (direction == 'left') {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment