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 2c727d7..c612989 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 @@ -39,11 +39,11 @@
- + - + - +
@@ -52,9 +52,9 @@
- + - +
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 7793e72..491a629 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 @@ -190,50 +190,55 @@ export class CreateJoinsPageComponent implements OnInit, AfterViewInit{ public removeTable(i: number){ this.requestInfoJoin.splice(i, 1); - const deleteAlias = this.allData[i].aliasSpecificTable; - let aliasSplitName = deleteAlias.slice(0, -1); - this.allData.splice(i, 1); - this.aliasData.shift(); - this.checkAndRemoveIfAliasWasUse(deleteAlias); + if(this.allData[i]){ + const deleteAlias = this.allData[i].aliasSpecificTable; + let aliasSplitName = deleteAlias.slice(0, -1); + this.allData.splice(i, 1); + this.aliasData.shift(); - let indexOfHighest = -1; - let highestValue = 0; - let tempAlias; - let inInclude = false; + this.checkAndRemoveIfAliasWasUse(deleteAlias); - if(this.allData.length === 0){ - this.requestInfoJoin.push(new JoinsTableComponent(this.infoColumnService, this.infoTableService)); - } else { - this.allData.forEach((join, ind) => { - const alias = join.aliasSpecificTable; - if(alias.includes(aliasSplitName.toString())){ - tempAlias = alias.slice(-1); - let numTempAlias = +tempAlias; - if(numTempAlias > highestValue){ - indexOfHighest = ind; - highestValue = numTempAlias; + let indexOfHighest = -1; + let highestValue = 0; + let tempAlias; + let inInclude = false; + + if(this.allData.length === 0){ + this.requestInfoJoin.push(new JoinsTableComponent(this.infoColumnService, this.infoTableService)); + } else { + this.allData.forEach((join, ind) => { + const alias = join.aliasSpecificTable; + if(alias.includes(aliasSplitName.toString())){ + tempAlias = alias.slice(-1); + let numTempAlias = +tempAlias; + if(numTempAlias > highestValue){ + indexOfHighest = ind; + highestValue = numTempAlias; + } + inInclude = true; } - inInclude = true; - } - }) - } - if(inInclude && highestValue != 0){ - this.allData[indexOfHighest].aliasSpecificTable = deleteAlias || ""; - this.aliasData.splice(i, 1); - this.aliasData[indexOfHighest].nameAlias = deleteAlias; - } else { - this.aliasData.splice(i, 1); - } - if(this.baseAlias){ - this.aliasData.unshift(this.baseAlias); + }) + } + if(inInclude && highestValue != 0){ + this.allData[indexOfHighest].aliasSpecificTable = deleteAlias || ""; + this.aliasData.splice(i, 1); + this.aliasData[indexOfHighest].nameAlias = deleteAlias; + } else { + this.aliasData.splice(i, 1); + } + if(this.baseAlias){ + this.aliasData.unshift(this.baseAlias); + } } + this.checkLength(); this.aliasData = [...this.aliasData] this.refreshRequestData(); } public checkLength(){ + console.log(this.requestInfoJoin.length); if(this.requestInfoJoin.length > 1){ this.oneJoinRemaining = false; } else { diff --git a/src/app/creation/joins-table/joins-table.component.html b/src/app/creation/joins-table/joins-table.component.html index 7e271a3..aa0c9a0 100644 --- a/src/app/creation/joins-table/joins-table.component.html +++ b/src/app/creation/joins-table/joins-table.component.html @@ -47,9 +47,9 @@
- + - +
diff --git a/src/app/custom-pipe/CustomInfoTableSearchPipe.ts b/src/app/custom-pipe/CustomInfoTableSearchPipe.ts index 7128198..09ba59b 100644 --- a/src/app/custom-pipe/CustomInfoTableSearchPipe.ts +++ b/src/app/custom-pipe/CustomInfoTableSearchPipe.ts @@ -7,15 +7,30 @@ import { Pipe, PipeTransform } from '@angular/core'; pure: false }) export class CustomFilterTable implements PipeTransform { - transform(items: InfoTable[], filter: string): any { - if (!items || !filter) { - return items; - } - // 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.toLowerCase()) !== -1); - } - - } + transform(items: InfoTable[], filter: string): any { + if (!items || !filter) { + return items; + } + + // Filter items array, keeping items that match the filter + const filteredItems = items.filter(item => item.nameTable.toLowerCase().indexOf(filter.toLowerCase()) !== -1); + + // Sort the filtered items by the length of the text in ascending order + const sortedItems = filteredItems.sort((a, b) => { + if (a.nameTable.length < b.nameTable.length) { + return -1; + } else if (a.nameTable.length > b.nameTable.length) { + return 1; + } else { + return 0; + } + }); + + return sortedItems; + } } + + + + + diff --git a/src/app/manager/add-script/add-script.component.html b/src/app/manager/add-script/add-script.component.html index d328ebd..44e560c 100644 --- a/src/app/manager/add-script/add-script.component.html +++ b/src/app/manager/add-script/add-script.component.html @@ -2,8 +2,8 @@
- - + +
@@ -64,7 +64,7 @@ (onDeSelectAll)="onDeselectAll($event)" > - +
diff --git a/src/app/manager/edit-script/edit-script.component.html b/src/app/manager/edit-script/edit-script.component.html index eb62240..e861c01 100644 --- a/src/app/manager/edit-script/edit-script.component.html +++ b/src/app/manager/edit-script/edit-script.component.html @@ -33,7 +33,7 @@ (onDeSelectAll)="onDeselectAll($event)" > - +
diff --git a/src/app/manager/script-management/script-management.component.html b/src/app/manager/script-management/script-management.component.html index d386b5c..e0aecd6 100644 --- a/src/app/manager/script-management/script-management.component.html +++ b/src/app/manager/script-management/script-management.component.html @@ -1,14 +1,14 @@
- +
Gestionnaire de Scripts
- Gérer les Tags - + Gérer les Tags +
diff --git a/src/app/manager/tags-management/tags-management.component.html b/src/app/manager/tags-management/tags-management.component.html index bc1a788..0d3fc40 100644 --- a/src/app/manager/tags-management/tags-management.component.html +++ b/src/app/manager/tags-management/tags-management.component.html @@ -2,9 +2,9 @@
Gestion des Tags
- + - +
@@ -19,7 +19,7 @@
- +
@@ -39,7 +39,7 @@ - +
@@ -47,8 +47,8 @@
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 e734eb6..e9c245a 100644 --- a/src/app/menu/navbar/navbar.component.html +++ b/src/app/menu/navbar/navbar.component.html @@ -15,17 +15,15 @@ diff --git a/src/app/search/request-page/request-page.component.html b/src/app/search/request-page/request-page.component.html index 9d57d6b..1bd1f66 100644 --- a/src/app/search/request-page/request-page.component.html +++ b/src/app/search/request-page/request-page.component.html @@ -1,4 +1,4 @@ - +
@@ -16,7 +16,7 @@ - +
@@ -34,8 +34,8 @@ - - + + @@ -43,7 +43,7 @@
- + @@ -52,7 +52,7 @@ - +
diff --git a/src/assets/button.scss b/src/assets/button.scss new file mode 100644 index 0000000..9bea508 --- /dev/null +++ b/src/assets/button.scss @@ -0,0 +1,51 @@ + +@layer components { + + .btn-white-simple { + @apply bg-white hover:bg-gray-100 text-gray-800 font-semibold py-2 px-4 border border-gray-400 rounded shadow; + } + + .btn-gray-simple { + @apply text-gray-300 hover:bg-gray-700 hover:text-white px-3 py-2 rounded-md text-sm font-medium; + } + + .btn-orange-simple { + @apply text-white bg-orange-400 hover:bg-gray-700 hover:text-white px-3 py-2 rounded-md text-sm font-medium hover:animate-pulse; + } + + .btn-grad-red-rose { + @apply text-gray-900 text-lg bg-gradient-to-br from-rose-600 to-red-400 hover:bg-gradient-to-bl focus:ring-4 focus:outline-none focus:ring-red-200 font-medium rounded-full px-5 py-2.5 text-center; + } + + .btn-grad-green-teal { + @apply text-white text-lg bg-gradient-to-br from-teal-400 to-green-500 hover:bg-gradient-to-bl focus:ring-4 focus:outline-none focus:ring-green-200 font-medium rounded-full px-5 py-2.5 text-center; + } + + .btn-grad-pink-orange { + @apply text-white bg-gradient-to-br from-pink-500 to-orange-400 hover:bg-gradient-to-bl focus:ring-4 focus:outline-none focus:ring-pink-200 font-medium rounded-lg text-sm px-5 py-2.5 text-center; + } + + .btn-grad-red-yellow { + @apply text-gray-900 bg-gradient-to-r from-red-200 via-red-300 to-yellow-200 hover:bg-gradient-to-bl focus:ring-4 focus:outline-none focus:ring-red-100 font-medium rounded-lg text-sm px-5 py-2.5 text-center; + } + + .btn-grad-green-blue { + @apply text-white bg-gradient-to-br from-green-400 to-blue-600 hover:bg-gradient-to-bl focus:ring-4 focus:outline-none focus:ring-green-200 font-medium rounded-lg text-sm px-5 py-2.5 text-center; + } + + .btn-grad-cyon-blue { + @apply text-white bg-gradient-to-r from-cyan-500 to-blue-500 hover:bg-gradient-to-bl focus:ring-4 focus:outline-none focus:ring-cyan-300 font-medium rounded-lg text-sm px-5 py-2.5 text-center; + } + + .btn-grad-purple-blue { + @apply text-white bg-gradient-to-br from-purple-600 to-blue-500 hover:bg-gradient-to-bl focus:ring-4 focus:outline-none focus:ring-blue-300 font-medium py-2.5 px-5 rounded-lg text-sm text-center; + } + + .btn-grad-teal-lime { + @apply text-black bg-gradient-to-r from-teal-200 to-lime-200 hover:bg-gradient-to-l hover:from-teal-200 hover:to-lime-200 focus:ring-4 focus:outline-none focus:ring-lime-200 font-medium py-2.5 px-5 rounded-lg text-center; + } + + .btn-grad-purple-pink { + @apply text-white bg-gradient-to-r from-purple-500 to-pink-500 hover:bg-gradient-to-l focus:ring-4 focus:outline-none focus:ring-purple-200 font-semibold py-2 px-4 rounded text-center; + } +} diff --git a/src/styles.scss b/src/styles.scss index cb0cdcb..ae38a8a 100644 --- a/src/styles.scss +++ b/src/styles.scss @@ -5,6 +5,8 @@ @import 'tailwindcss/components'; @import 'tailwindcss/utilities'; +@import 'assets/button.scss'; + html, body { height: 100%; }