-
-
-
-
-
-
-
-
nombre d'indice: {{nbIndice}}
+
+
+
+
-
-
+
\ No newline at end of file
diff --git a/src/app/components/sudoku/sudoku.component.ts b/src/app/components/sudoku/sudoku.component.ts
index 890dcc9..33832ab 100644
--- a/src/app/components/sudoku/sudoku.component.ts
+++ b/src/app/components/sudoku/sudoku.component.ts
@@ -4,6 +4,7 @@ import { NgFor,NgIf } from '@angular/common';
import { ActivatedRoute } from '@angular/router';
import { UserMenuComponent } from '../user-menu/user-menu.component';
import { SudokuService } from '../../services/sudoku-service';
+import { Block } from '@angular/compiler';
@Component({
selector: 'app-sudoku',
@@ -16,6 +17,8 @@ export class SudokuComponent {
grille: number[][] = [];
nbIndice: number = 0;
haveWin: boolean = false;
+ nbEachNumber:number[] = [0,0,0,0,0,0,0,0,0];
+ lastInputClicked: HTMLInputElement | undefined;
constructor(protected sudokuService: SudokuService, private activatedRoute: ActivatedRoute) {
}
@@ -89,6 +92,59 @@ export class SudokuComponent {
}
if (this.grille.length == 0) {
setTimeout(()=> {this.Request(difficulty)},100);
- }// lancer un await ici si possible
+ return;
+ }
+ this.updateNb();
+ }
+
+ public colorSameRowCol(a:number ,b:number, event: Event) {
+ if (event.target != null) this.lastInputClicked =
event.target;
+ this.resetColor();
+ let xp:number = (a%3)*3+ b%3;
+ let yp:number = Math.floor(a/3)*3+Math.floor(b/3);
+ for(let x:number=0; x<9; x++) {
+ for(let y:number=0; y<9; y++) {
+ if (xp == x || yp == y) {
+ let newx:number = (y%3)*3+(x%3);
+ let newy:number = Math.floor(y/3)*3+Math.floor(x/3);
+ document.getElementById("xy"+newx.toString()+newy.toString())?.classList.add("selectedRowCol")
+ }
+ }
+ }
+ }
+
+ public resetColor() {
+ this.updateNb();
+ let inputs:HTMLCollection = document.getElementsByClassName("selectedRowCol");
+ for (let i:number=0;inputs.length>0;i++) {
+ inputs[0].classList.remove("selectedRowCol");
+ }
+ }
+
+ private updateNb() {
+ for(let i:number=1;i<10;i++) {
+ this.nbEachNumber[i-1] = this.nb(i);
+ }
+ }
+
+ private nb(i:number) {
+ let a:number=0
+ this.grille.forEach(e=>{
+ a += e.filter((v) => (v == i)).length
+ })
+ return 9-a;
+ }
+
+ public key() {
+ this.grille = this.getGrid();
+ this.updateNb();
+ }
+
+ public addNumber(nb:number) {
+ this.resetColor();
+ if (this.nbEachNumber[nb-1] <= 0) return;
+ if (this.lastInputClicked == null) return;
+ this.lastInputClicked.value = nb.toString();
+ this.key();
}
}
\ No newline at end of file
diff --git a/src/app/components/user-list/user-list.component.css b/src/app/components/user-list/user-list.component.css
index e69de29..ddb81ee 100644
--- a/src/app/components/user-list/user-list.component.css
+++ b/src/app/components/user-list/user-list.component.css
@@ -0,0 +1,40 @@
+section {
+ position: absolute;
+ top: 50%;
+ left: 50%;
+ transform: translate(-50%,-50%);
+ min-height: 50vh;
+ min-width: 50vw;
+}
+
+thead, tr {
+ width: 100%;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+}
+
+thead {
+ border-bottom: 1px solid #000;
+}
+
+th, td {
+ position: relative;
+ width: 100%;
+ text-align: center;
+}
+
+tbody {
+ width: 100%;
+ display: block;
+}
+
+.pagination {
+ display: flex;
+ justify-content: center;
+ align-items: center;
+}
+
+.pagination > * {
+ margin: 20px;
+}
\ No newline at end of file
diff --git a/src/app/components/user-list/user-list.component.html b/src/app/components/user-list/user-list.component.html
index 7c630a0..7872149 100644
--- a/src/app/components/user-list/user-list.component.html
+++ b/src/app/components/user-list/user-list.component.html
@@ -1,27 +1,29 @@
-User list
+
+
+
+ | Pseudo |
+ Nombre de points |
+ Streak |
+
+
+
+
+ | {{user.login}} |
+ {{user.points}} |
+ {{user.streak}} |
+
+
+
-
-
- | Pseudo |
- Nombre de points |
- Streak |
-
-
-
-
- | {{user.login}} |
- {{user.points}} |
- {{user.streak}} |
-
-
-
-
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/src/app/components/user-list/user-list.component.ts b/src/app/components/user-list/user-list.component.ts
index 9f9b30d..707f2ad 100644
--- a/src/app/components/user-list/user-list.component.ts
+++ b/src/app/components/user-list/user-list.component.ts
@@ -5,6 +5,7 @@ import { NgFor } from '@angular/common';
import { User } from '../../models/user.model';
import { UserService } from '../../services/user-service';
import { UserMenuComponent } from '../user-menu/user-menu.component';
+import { DataSource } from '@angular/cdk/collections';
@Component({
selector: 'app-user-list',
@@ -25,9 +26,7 @@ export class UserListComponent {
ngOnInit() {
this.nbPage = 1;
- this.users = this.userService.getAll();
this.loadPage(0);
- console.log(this.users);
}
public changeWatchedvar(newVar:string) {
@@ -38,7 +37,7 @@ export class UserListComponent {
}
public loadPage(nb: number) {
- if (this.nbPage + nb > this.userService.getNbPage() || this.nbPage + nb <= 0) {return;}
+ if ((this.nbPage + nb > this.userService.getNbPage() && this.users.length != 0) || this.nbPage + nb <= 0) {return;}
this.nbPage += nb;
switch(this.sortBy) {
case 'nbPts':
@@ -51,5 +50,7 @@ export class UserListComponent {
this.users = this.userService.getUserNbStreak(this.nbPage,this.sortSens);
break;
}
+
+ if (this.users.length == 0) {setTimeout(()=>{this.nbPage -=nb;this.loadPage(nb)},100)};
}
}
diff --git a/src/app/services/user-service.ts b/src/app/services/user-service.ts
index 2807379..3dcd987 100644
--- a/src/app/services/user-service.ts
+++ b/src/app/services/user-service.ts
@@ -6,7 +6,7 @@ import { User } from "../models/user.model";
export class UserService {
private users: User[];
private readonly userApiUrl = 'https://664ba07f35bbda10987d9f99.mockapi.io/api/users';
- private pageSize: number = 5;
+ public readonly pageSize: number = 5;
public constructor(private http: HttpClient){
this.users = [];