diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 8e7a8a2..a97434b 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -14,7 +14,7 @@ import { MatStepperModule } from '@angular/material/stepper'; import { MatToolbarModule } from '@angular/material/toolbar'; import {MatDialogModule} from '@angular/material/dialog'; import { MatIconModule } from "@angular/material/icon"; -import { Custom_Ng2SearchPipe } from './../Custom_Ng2SearchPipe'; +import { Custom_Ng2SearchPipe } from './custom-pipe/Custom_Ng2SearchPipe'; import { FormsModule } from '@angular/forms'; import { JoinsPageComponent } from './joins/joins-page/joins-page.component'; import { CreateJoinsPageComponent } from './creation/create-joins-page/create-joins-page.component'; @@ -25,8 +25,8 @@ import {MatProgressSpinnerModule} from '@angular/material/progress-spinner'; import { ScriptManagementComponent } from './manager/script-management/script-management.component'; import { AddScriptComponent } from './manager/add-script/add-script.component'; import { DndDirective } from './directives/dnd.directive' -import { CustomFilterScript } from 'src/CustomFilterScript'; -import { CustomFilterTable } from 'src/CustomInfoTableSearchPipe'; +import { CustomFilterScript } from 'src/app/custom-pipe/CustomFilterScript'; +import { CustomFilterTable } from 'src/app/custom-pipe/CustomInfoTableSearchPipe'; import { EditScriptComponent } from './manager/edit-script/edit-script.component'; import { TagsManagementComponent } from './manager/tags-management/tags-management.component'; import { NgMultiSelectDropDownModule } from 'ng-multiselect-dropdown'; diff --git a/src/app/creation/columns-card/columns-card.component.html b/src/app/creation/columns-card/columns-card.component.html index d701a5b..abc7be5 100644 --- a/src/app/creation/columns-card/columns-card.component.html +++ b/src/app/creation/columns-card/columns-card.component.html @@ -1,5 +1,4 @@
-
diff --git a/src/app/creation/columns-card/columns-card.component.ts b/src/app/creation/columns-card/columns-card.component.ts index 66b5d86..b49e20d 100644 --- a/src/app/creation/columns-card/columns-card.component.ts +++ b/src/app/creation/columns-card/columns-card.component.ts @@ -21,7 +21,6 @@ export class ColumnsCardComponent { public sendColumnsData(){ if(this.baseColumnData && this.specificColumnData){ - console.log(this.baseColumnData, this.specificColumnData) let tempsOpe = "AND"; if(this.childIndex === 0){ tempsOpe = "ON"; @@ -31,7 +30,6 @@ export class ColumnsCardComponent { aliasColumn: this.baseColumnData.nameColumn, specColumn: this.specificColumnData.nameColumn, } - console.log(tempColumnData) this.selectedColumn.emit(tempColumnData); } } diff --git a/src/app/creation/create-joins-page/create-joins-page.component.html b/src/app/creation/create-joins-page/create-joins-page.component.html index 5f3b6ea..7f22d83 100644 --- a/src/app/creation/create-joins-page/create-joins-page.component.html +++ b/src/app/creation/create-joins-page/create-joins-page.component.html @@ -1,80 +1,74 @@ -
-
-
-
-
-
Selectionner un Schéma et une Table (Base) :
-
-
- - +
+
+
- -
+
Selectionner un Schéma et une Table (Base) :
-
- - - +
+
+ + - -
- -
- -
- - -
+ +
+
+ + + -
+ +
+
+
+ + +
+
-
-
-
- -
- +
+
+ +
+ - + - -
-
+
+
+
-
-
- -
- +
+
+ +
+ - -
-
+
+
+
-
-
-
Résultat de la requête :
- -
-
{{newRequestData}} -
-
+
+
+
Résultat de la requête :
+ +
+
{{newRequestData}}
+
+
-
diff --git a/src/app/creation/create-joins-page/create-joins-page.component.ts b/src/app/creation/create-joins-page/create-joins-page.component.ts index e17bddd..7793e72 100644 --- a/src/app/creation/create-joins-page/create-joins-page.component.ts +++ b/src/app/creation/create-joins-page/create-joins-page.component.ts @@ -135,7 +135,6 @@ export class CreateJoinsPageComponent implements OnInit, AfterViewInit{ public getNameBaseTable(){ let previousBaseAlias; if(this.baseSchema && this.baseTableData){ - console.log(this.baseTableData) this.baseTableName = this.baseTableData.nameTable; this.baseTableNameLowerCase = this.baseTableName?.toLowerCase(); this.baseAlias = { diff --git a/src/app/creation/joins-table/joins-table.component.html b/src/app/creation/joins-table/joins-table.component.html index 3275329..83d0a9e 100644 --- a/src/app/creation/joins-table/joins-table.component.html +++ b/src/app/creation/joins-table/joins-table.component.html @@ -1,57 +1,55 @@ -
-
-
Selectionner les informations de la jointure :
-
- -
- - -
- -
- - - - -
- -
- - - - -
- -
- - - - -
+
+
Selectionner les informations de la jointure :
+
+ +
+ + +
+ +
+ + + + +
+ +
+ + +
-
- - +
+ + + +
-
- +
+ +
+ + +
+ +
+ -
- +
+ - -
+
diff --git a/src/app/creation/joins-table/joins-table.component.ts b/src/app/creation/joins-table/joins-table.component.ts index 3d6245b..ad013d3 100644 --- a/src/app/creation/joins-table/joins-table.component.ts +++ b/src/app/creation/joins-table/joins-table.component.ts @@ -144,7 +144,6 @@ export class JoinsTableComponent implements OnInit, OnChanges{ } public verifyAndSendData(){ - console.log(this.joinData) if(this.specificSchema && this.specificTable && this.joinData && this.baseAlias && this.columnsData){ const tempLower = this.specificTable.toLowerCase(); this.myJoinData = { @@ -186,7 +185,6 @@ export class JoinsTableComponent implements OnInit, OnChanges{ } this.verifyAndSendData(); - console.log(this.columnsData); } public checkValue(event: any){ diff --git a/src/app/creation/where-card/where-card.component.html b/src/app/creation/where-card/where-card.component.html index 9d3e88a..981463b 100644 --- a/src/app/creation/where-card/where-card.component.html +++ b/src/app/creation/where-card/where-card.component.html @@ -1,42 +1,41 @@ -
-
-
Selectionner les informations de la Condition :
-
- -
- - -
- -
- - - - -
- -
- - - - -
- -
- - -
- -
- - -
+
+
Selectionner les informations de la Condition :
+
+ +
+ + +
+ +
+ + + + +
+ +
+ + + + +
+ +
+ +
+ +
+ + +
+
diff --git a/src/app/creation/where-card/where-card.component.ts b/src/app/creation/where-card/where-card.component.ts index 022a4ac..a628f75 100644 --- a/src/app/creation/where-card/where-card.component.ts +++ b/src/app/creation/where-card/where-card.component.ts @@ -48,7 +48,6 @@ export class WhereCardComponent { this.operator = "WHERE"; } if(this.operator && this.baseAlias && this.baseColumnData && this.conditionOperator && this.conditionValue){ - console.log(this.baseColumnData); this.conditionData.emit([this.operator, this.baseAlias.nameAlias, this.baseColumnData.nameColumn, this.conditionOperator, this.conditionValue]); } } diff --git a/src/CustomFilterScript.ts b/src/app/custom-pipe/CustomFilterScript.ts similarity index 92% rename from src/CustomFilterScript.ts rename to src/app/custom-pipe/CustomFilterScript.ts index c47a3ac..2ec2a61 100644 --- a/src/CustomFilterScript.ts +++ b/src/app/custom-pipe/CustomFilterScript.ts @@ -1,5 +1,5 @@ import { Pipe, PipeTransform } from '@angular/core'; -import { Script } from './app/model/script'; +import { Script } from '../model/script'; @Pipe({ name: 'filterscript', diff --git a/src/CustomInfoTableSearchPipe.ts b/src/app/custom-pipe/CustomInfoTableSearchPipe.ts similarity index 84% rename from src/CustomInfoTableSearchPipe.ts rename to src/app/custom-pipe/CustomInfoTableSearchPipe.ts index 2817dfd..7128198 100644 --- a/src/CustomInfoTableSearchPipe.ts +++ b/src/app/custom-pipe/CustomInfoTableSearchPipe.ts @@ -1,4 +1,4 @@ -import { InfoTable } from './app/model/info-table'; +import { InfoTable } from '../model/info-table'; import { Pipe, PipeTransform } from '@angular/core'; @@ -14,7 +14,7 @@ export class CustomFilterTable implements PipeTransform { // filter items array, items which match and return true will be // kept, false will be filtered out if(filter){ - return items.filter(item => item.nameTable.toLowerCase().indexOf(filter) !== -1); + return items.filter(item => item.nameTable.toLowerCase().indexOf(filter.toLowerCase()) !== -1); } } diff --git a/src/Custom_Ng2SearchPipe.ts b/src/app/custom-pipe/Custom_Ng2SearchPipe.ts similarity index 100% rename from src/Custom_Ng2SearchPipe.ts rename to src/app/custom-pipe/Custom_Ng2SearchPipe.ts diff --git a/src/app/directives/dnd.directive.ts b/src/app/directives/dnd.directive.ts index 93eb179..3f31fd1 100644 --- a/src/app/directives/dnd.directive.ts +++ b/src/app/directives/dnd.directive.ts @@ -31,17 +31,6 @@ export class DndDirective { let files = evt.dataTransfer.files; if (files.length > 0) { this.fileDropped.emit(files); - // for(let i = 0; i < files.length; i++){ - // var reader = new FileReader(); - // console.log(files[i]) - // reader.readAsText(files[i]); - // reader.onload = () => { - // this.listOfContent.push(reader.result as string); - - // } - // } - - // this.textDrop.emit( this.listOfContent); } } diff --git a/src/app/joins/joins-page/joins-page.component.html b/src/app/joins/joins-page/joins-page.component.html index ab914d7..c527d15 100644 --- a/src/app/joins/joins-page/joins-page.component.html +++ b/src/app/joins/joins-page/joins-page.component.html @@ -26,35 +26,31 @@
- - - -
Selectionner un Schéma et une Table :
+
-
- - - + + - + -
+
-
- - +
+ + - -
+ +
+
diff --git a/src/app/joins/joins-page/joins-page.component.ts b/src/app/joins/joins-page/joins-page.component.ts index 7bbfb64..5c7173d 100644 --- a/src/app/joins/joins-page/joins-page.component.ts +++ b/src/app/joins/joins-page/joins-page.component.ts @@ -50,7 +50,6 @@ export class JoinsPageComponent implements OnInit{ this.infoTableService.getSchemas().subscribe( (response : String[]) => { this.allSchema = response; - console.log(response); }, (error: HttpErrorResponse) => { alert(error.message) @@ -81,7 +80,6 @@ export class JoinsPageComponent implements OnInit{ this.infoTableService.getTablesBySchema(event.target.value).subscribe( (response : InfoTable[]) => { this.tablesBySecondSchema = response; - console.log(response); }, (error: HttpErrorResponse) => { alert(error.message) @@ -98,7 +96,6 @@ export class JoinsPageComponent implements OnInit{ this.infoColumnService.getColumn(event.target.value).subscribe( (response : InfoColumn) => { this.displayColumns = response; - console.log(response); }, (error: HttpErrorResponse) => { alert(error.message) @@ -117,7 +114,6 @@ export class JoinsPageComponent implements OnInit{ this.infoColumnService.getColumnsForJoinTwo(this.tables, this.schemas).subscribe( (response : InfoColumn[]) => { this.infoColumn = response; - console.log(this.infoColumn); if(this.infoColumn?.length === 0){ this.columnIsFull = false; } else { diff --git a/src/app/manager/add-script/add-script.component.html b/src/app/manager/add-script/add-script.component.html index 42aef71..2e4e390 100644 --- a/src/app/manager/add-script/add-script.component.html +++ b/src/app/manager/add-script/add-script.component.html @@ -1,76 +1,71 @@ -
-
-
-
- - +
+
+
+ + +
+
+
+
Veuillez rentrer le contenu du Script :
+
-
-
-
-
Veuillez rentrer le contenu du Script :
- -
+
+
+ + +
Glisser / Déposer le script ici
+
+
+
+
+
+
{{ file?.name }}
+
Taille: {{ formatBytes(file.size) }}
+
-
-
- - -
Glisser / Déposer le script ici
-
-
-
-
-
-
{{ file?.name }}
-
Taille: {{ formatBytes(file.size) }}
-
-
- -
-
+
+
+
-
Contenu du Script :
-
-
+
Contenu du Script :
+
+
-
-
Informations du Script :
-
Nom du Script :
- -
Type d'extension :
- -
Description du Script :
- -
Tags associés :
- +
Informations du Script :
+
Nom du Script :
+ +
Type d'extension :
+ +
Description du Script :
+ +
Tags associés :
+ - - + -
diff --git a/src/app/manager/edit-script/edit-script.component.html b/src/app/manager/edit-script/edit-script.component.html index 00917f0..9f2e0b4 100644 --- a/src/app/manager/edit-script/edit-script.component.html +++ b/src/app/manager/edit-script/edit-script.component.html @@ -1,32 +1,28 @@ -
-
-
-
-
-
Contenu du Script :
- - - -
+
-
-
Informations du Script :
-
Nom du Script :
- -
Type d'extension :
- -
Description du Script :
- -
Tags associés :
- +
Informations du Script :
+
Nom du Script :
+ +
Type d'extension :
+ +
Description du Script :
+ +
Tags associés :
+ - -
+
+ diff --git a/src/app/manager/script-management/script-management.component.html b/src/app/manager/script-management/script-management.component.html index 09d3bdc..d386b5c 100644 --- a/src/app/manager/script-management/script-management.component.html +++ b/src/app/manager/script-management/script-management.component.html @@ -9,7 +9,6 @@
Gérer les Tags -
@@ -26,10 +25,10 @@ [settings]="dropdownSettings" [data]="dropdownTagList" [(ngModel)]="selectedTagList" - (onSelect)="onItemSelect($event)" + (onSelect)="sortWithFilter()" (onSelectAll)="onSelectAll($event)" - (onDeSelect)="onItemDeselect($event)" - (onDeSelectAll)="onDeselectAll($event)" + (onDeSelect)="sortWithFilter()" + (onDeSelectAll)="onDeselectAll()" >
@@ -50,66 +49,64 @@
+
-
- - - - -
-
-
Description :
- - Cliquer pour {{ descriptionDisplay ? 'fermer' : 'ouvrir' }} - -
-
- {{ descText }} -
+ + +
+
+
Description :
+ + Cliquer pour {{ descriptionDisplay ? 'fermer' : 'ouvrir' }} +
- - -
-
-
Contenu du Script :
- - Cliquer pour {{ contentDisplay ? 'fermer' : 'ouvrir' }} - -
-
- -
- - -
-
-
Tags associés :
- - Cliquer pour {{ tagsDisplay ? 'fermer' : 'ouvrir' }} - -
-
-
-
- {{tagString}} -
+
+ + +
+
+
Tags associés :
+ + Cliquer pour {{ tagsDisplay ? 'fermer' : 'ouvrir' }} + +
+
+
+
+ {{tagString}}
- - +
+ +
diff --git a/src/app/manager/script-management/script-management.component.ts b/src/app/manager/script-management/script-management.component.ts index ce4a017..ddd51ca 100644 --- a/src/app/manager/script-management/script-management.component.ts +++ b/src/app/manager/script-management/script-management.component.ts @@ -65,7 +65,6 @@ export class ScriptManagementComponent implements OnInit { const tempDescScript = this.allLinksScriptTag.filter(link => link.scriptName === script.name); this.descText = tempDescScript[0].description; this.tagsListOfSpecScript = tempDescScript[0].tags; - console.log(this.tagsListOfSpecScript); } } @@ -79,25 +78,16 @@ export class ScriptManagementComponent implements OnInit { }); } - onItemSelect(item: any) { - this.sortWithFilter(); - } - onSelectAll(items: any) { this.selectedTagList = items; this.sortWithFilter(); } - onItemDeselect(item: any){ - this.sortWithFilter(); - } - - onDeselectAll(items: any){ + onDeselectAll(){ this.selectedTagList = []; this.allScripts = this.memoryScripts; } - public sortWithFilter(){ let tempLinksScriptsWithTags: LinkScriptTag[] = []; if(this.selectedTagList.length !==0){ @@ -165,7 +155,6 @@ export class ScriptManagementComponent implements OnInit { (response : Script[]) => { this.allScripts = response; this.memoryScripts = response; - console.log(this.memoryScripts) }, (error: HttpErrorResponse) => { alert(error.message) diff --git a/src/app/manager/tags-management/tags-management.component.html b/src/app/manager/tags-management/tags-management.component.html index 3c96147..bc1a788 100644 --- a/src/app/manager/tags-management/tags-management.component.html +++ b/src/app/manager/tags-management/tags-management.component.html @@ -1,61 +1,58 @@ -
-
-
Gestion des Tags
-
- - - -
-
-
-
-
-
Nom du Tag :
- -
-
-
Description du Tag :
- -
-
- -
+
+
Gestion des Tags
+
+ + + +
+
- -
-
-
-
Nom du Tag :
-
{{ previousName }}
-
Nouveau nom :
- -
-
-
Description du Tag :
-
{{ previousDesc }}
-
Nouvelle description :
- -
+
+
+
Nom du Tag :
+ +
+
+
Description du Tag :
+
-
+ +
-
-
-
Nom du Tag : {{ tag.nameTag }}
-
{{ tag.descriptionTag }}
-
- - - -
+
+
+
+
+
Nom du Tag :
+
{{ previousName }}
+
Nouveau nom :
+ +
+
+
Description du Tag :
+
{{ previousDesc }}
+
Nouvelle description :
+ +
+
+ +
+
+
+
Nom du Tag : {{ tag.nameTag }}
+
{{ tag.descriptionTag }}
+
+ +
+ diff --git a/src/app/menu/navbar/navbar.component.html b/src/app/menu/navbar/navbar.component.html index 444fe83..af26d38 100644 --- a/src/app/menu/navbar/navbar.component.html +++ b/src/app/menu/navbar/navbar.component.html @@ -1,47 +1,40 @@