Popravljena numeracija redova kod stranicenja u column-table. Dodat submit na enter gde je falio. Css izmene.

8 files changed, 41 insertions, 32 deletions

diff --git a/backend/api/api/appsettings.json b/backend/api/api/appsettings.json
index 44d63ac3..ec8f7dd8 100644
--- a/backend/api/api/appsettings.json
+++ b/backend/api/api/appsettings.json
@@ -16,22 +16,22 @@
     "UserStoreDatabaseSettings": {
         /* LocalHost*/
 
-        /*"ConnectionString": "mongodb://127.0.0.1:27017/",
+        "ConnectionString": "mongodb://127.0.0.1:27017/",
         "DatabaseName": "si_project",
         "CollectionName": "users",
         "DatasetCollectionName": "Dataset",
         "ModelCollectionName": "Model",
         "PredictorCollectionName": "Predictor",
         "FilesCollectionName": "Files",
-        "ExperimentCollectionName": "Experiment"*/
+        "ExperimentCollectionName": "Experiment"
 
-        "ConnectionString": "mongodb+srv://si_user:si_user@sidatabase.twtfm.mongodb.net/myFirstDatabase?retryWrites=true&w=majority",
+        /*"ConnectionString": "mongodb+srv://si_user:si_user@sidatabase.twtfm.mongodb.net/myFirstDatabase?retryWrites=true&w=majority",
         "DatabaseName": "si_db",
         "CollectionName": "users",
         "DatasetCollectionName": "Dataset",
         "ModelCollectionName": "Model",
         "PredictorCollectionName": "Predictor",
         "FilesCollectionName": "Files",
-        "ExperimentCollectionName": "Experiment" 
+        "ExperimentCollectionName": "Experiment" */
     }
 }
\ No newline at end of file
diff --git a/frontend/src/app/_elements/column-table/column-table.component.css b/frontend/src/app/_elements/column-table/column-table.component.css
index f7f07e62..311773f7 100644
--- a/frontend/src/app/_elements/column-table/column-table.component.css
+++ b/frontend/src/app/_elements/column-table/column-table.component.css
@@ -22,7 +22,7 @@ table.fixed td {
 
 table.fixed th {
     overflow: hidden;
-    max-width: 120px;
+    max-width: 250px;
     min-width: 120px;
     vertical-align: middle;
     background-color: var(--ns-primary-50);
diff --git a/frontend/src/app/_elements/column-table/column-table.component.html b/frontend/src/app/_elements/column-table/column-table.component.html
index 31c32dfd..bb5914bd 100644
--- a/frontend/src/app/_elements/column-table/column-table.component.html
+++ b/frontend/src/app/_elements/column-table/column-table.component.html
@@ -35,7 +35,7 @@
                     </thead>
                     <tbody>
                         <tr *ngFor="let row of tableData; let i = index">
-                            <th>#{{i}}</th>
+                            <th>#{{((this.begin/10)+1)*10-10+i+1}}</th>
                             <td *ngFor="let col of row; let j = index" [ngClass]="{'text-disabled' : !columnsChecked[j]}">
                                 <div class="text-overflow">
                                     {{col}}
@@ -200,7 +200,7 @@
                                     </mat-menu>
                                 </div>
                                 <div *ngIf="colInfo.numNulls == 0" class="text-left">
-                                    Nema null vrednosti.
+                                    Nema nedostajućih vrednosti.
                                 </div>
                             </td>
                         </tr>
diff --git a/frontend/src/app/_modals/alert-dialog/alert-dialog.component.html b/frontend/src/app/_modals/alert-dialog/alert-dialog.component.html
index 2d7e4d86..84793260 100644
--- a/frontend/src/app/_modals/alert-dialog/alert-dialog.component.html
+++ b/frontend/src/app/_modals/alert-dialog/alert-dialog.component.html
@@ -1,9 +1,9 @@
-
-
-  <h2 mat-dialog-title >{{data.title}}</h2>
-  <div mat-dialog-content class="mt-4 text-offwhite" >
-    {{data.message}}
-  </div>
-  <div mat-dialog-actions class="d-flex justify-content-center mt-4">
+<h2 mat-dialog-title>{{data.title}}</h2>
+<div mat-dialog-content class="mt-4 text-offwhite">
+    <form (keydown)="withEnterKey($event)">
+        {{data.message}}
+    </form>
+</div>
+<div mat-dialog-actions class="d-flex justify-content-center mt-4">
     <button mat-raised-button cdkFocusInitial (click)="onOkClick()" color="basic">OK</button>
-  </div>
\ No newline at end of file
+</div>
\ No newline at end of file
diff --git a/frontend/src/app/_modals/alert-dialog/alert-dialog.component.ts b/frontend/src/app/_modals/alert-dialog/alert-dialog.component.ts
index e15f3c6f..7558b527 100644
--- a/frontend/src/app/_modals/alert-dialog/alert-dialog.component.ts
+++ b/frontend/src/app/_modals/alert-dialog/alert-dialog.component.ts
@@ -20,9 +20,11 @@ export class AlertDialogComponent {
     //public dialog: MatDialog
   ) {}
 
+  withEnterKey(keyboardEvent: KeyboardEvent) {
+    if (keyboardEvent.code == "Enter" || keyboardEvent.code == "NumpadEnter") 
+      this.onOkClick();
+  }
   onOkClick(): void {
     this.dialogRef.close();
   }
-
-
 }
diff --git a/frontend/src/app/_modals/encoding-dialog/encoding-dialog.component.html b/frontend/src/app/_modals/encoding-dialog/encoding-dialog.component.html
index 08c1f26b..fed8f8d7 100644
--- a/frontend/src/app/_modals/encoding-dialog/encoding-dialog.component.html
+++ b/frontend/src/app/_modals/encoding-dialog/encoding-dialog.component.html
@@ -1,15 +1,17 @@
 <h2 mat-dialog-title class="text-center">Enkodiranje svih kolona</h2>
 <div mat-dialog-content class="mt-5 mb-4">
     <p>Sve izabrane kolone biće enkodirane metodom:</p>
-    <form (keydown)="withEnterKey($event)">
-        <mat-form-field>
-            <mat-select matNativeControl [(value)]="selectedEncodingType" cdkFocusInitial>
-                <mat-option *ngFor="let option of Object.keys(Encoding); let optionName of Object.values(Encoding)" [value]="option">
-                    {{ optionName }}
-                </mat-option>
-            </mat-select>
-        </mat-form-field>
-    </form>
+    <div class="d-flex justify-content-center">
+        <form (keydown)="withEnterKey($event)">
+            <mat-form-field>
+                <mat-select matNativeControl [(value)]="selectedEncodingType" cdkFocusInitial>
+                    <mat-option *ngFor="let option of Object.keys(Encoding); let optionName of Object.values(Encoding)" [value]="option">
+                        {{ optionName }}
+                    </mat-option>
+                </mat-select>
+            </mat-form-field>
+        </form>
+    </div>
 </div>
 <div mat-dialog-actions class="justify-content-center">
     <button id="btnYes" mat-stroked-button color="basic" (click)="onYesClick()">Potvrdi</button>
diff --git a/frontend/src/app/_modals/yes-no-dialog/yes-no-dialog.component.html b/frontend/src/app/_modals/yes-no-dialog/yes-no-dialog.component.html
index 06e74093..77e7be42 100644
--- a/frontend/src/app/_modals/yes-no-dialog/yes-no-dialog.component.html
+++ b/frontend/src/app/_modals/yes-no-dialog/yes-no-dialog.component.html
@@ -1,8 +1,10 @@
 <h2 mat-dialog-title class="text-muted">{{data.title}}</h2>
 <div mat-dialog-content class="mt-4" style="color: rgb(81, 76, 76);">
-  {{data.message}}
+    <form (keydown)="withEnterKey($event)">
+        {{data.message}}
+    </form>
 </div>
 <div mat-dialog-actions class="d-flex justify-content-center mt-4">
-  <button mat-button cdkFocusInitial (click)="onYesClick()" style="background-color: lightgray;">Da</button>
-  <button mat-button cdkFocusInitial (click)="onNoClick()" style="background-color: lightgray;">Ne</button>
+    <button mat-button cdkFocusInitial (click)="onYesClick()" style="background-color: lightgray;">Da</button>
+    <button mat-button cdkFocusInitial (click)="onNoClick()" style="background-color: lightgray;">Ne</button>
 </div>
\ No newline at end of file
diff --git a/frontend/src/app/_modals/yes-no-dialog/yes-no-dialog.component.ts b/frontend/src/app/_modals/yes-no-dialog/yes-no-dialog.component.ts
index de1cdd4f..a7db1e7f 100644
--- a/frontend/src/app/_modals/yes-no-dialog/yes-no-dialog.component.ts
+++ b/frontend/src/app/_modals/yes-no-dialog/yes-no-dialog.component.ts
@@ -24,10 +24,13 @@ export class YesNoDialogComponent {
   onNoClick(): void {
     this.dialogRef.close();
   }
-  onYesClick():void{
+
+  withEnterKey(keyboardEvent: KeyboardEvent) {
+      if (keyboardEvent.code == "Enter" || keyboardEvent.code == "NumpadEnter") 
+        this.onYesClick();
+  }
+  onYesClick():void {
     this.data.yesFunction();
     this.dialogRef.close();
   }
-
-
 }