poprawki (#44)

* poprawki * path fix
sgfn · Jun 11, 2024 · 4efb7c7 · 4efb7c7
1 parent 4468de2
commit 4efb7c7
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 18 deletions.
diff --git a/backend/src/main/java/com/rikishi/rikishi/controller/DuelsController.java b/backend/src/main/java/com/rikishi/rikishi/controller/DuelsController.java
@@ -74,7 +74,7 @@ public void patchDuel(@RequestBody Map<String, String> fields, @PathVariable Lon
 
     @GetMapping("/duels/curr")
     public Duels getCurrentDuels() {
-        fightService.tryReload();
+        //fightService.tryReload();
         return new Duels(
             fightService.getCurrFights().map(Fight::toJson).toList()
         );

diff --git a/backend/src/main/java/com/rikishi/rikishi/controller/ReportController.java b/backend/src/main/java/com/rikishi/rikishi/controller/ReportController.java
@@ -16,8 +16,8 @@ public ReportController(ReportService reportService) {
         this.reportService = reportService;
     }
 
-//    @GetMapping("/report")
-//    public void getReport(@RequestParam String saveTo) throws DocumentException, FileNotFoundException {
-//        reportService.generate(saveTo);
-//    }
+   @GetMapping("/report")
+    public void getReport(@RequestParam String saveTo) throws DocumentException, FileNotFoundException {
+        reportService.generate(saveTo);
+    }
 }
diff --git a/backend/src/main/java/com/rikishi/rikishi/generator/ReportGenerator.java b/backend/src/main/java/com/rikishi/rikishi/generator/ReportGenerator.java
@@ -107,8 +107,8 @@ private void addFightWeightClassSection(WeightClass weightClass) throws Document
             var f2 = fight.secondUser();
 
             addTableColumns(table, List.of(
-                new Column(String.format("%s %s", f1.name(), f1.surname()), fighterColor.apply(f1)),
-                new Column(String.format("%s %s", f2.name(), f2.surname()), fighterColor.apply(f2)),
+                f1 != null ? new Column(String.format("%s %s", f1.name(), f1.surname()), fighterColor.apply(f1)) : text(""),
+                f2 != null ? new Column(String.format("%s %s", f2.name(), f2.surname()), fighterColor.apply(f2)) : text(""),
                 text(String.valueOf(fight.number())),
                 text(String.format("%s:%s", fight.score1(), fight.score2()))
             ));

diff --git a/frontend/src/components/ChangeCategoryForm.js b/frontend/src/components/ChangeCategoryForm.js
@@ -6,7 +6,7 @@ import exitIcon from '../../assets/icons/exit.png';
 import config from '../config.js'
 
 function ChangeCategoryForm() {
-  const [newWeightCategory, setNewWeightCategory] = useState("Light-weight - M");
+  const [newWeightCategory, setNewWeightCategory] = useState("Men Heavy-weight");
   const { id } = useParams();
   const {
     isLoading: isPending,
@@ -19,7 +19,8 @@ function ChangeCategoryForm() {
 
   const handleSubmit = (e) => {
     e.preventDefault();
-    patchData({ weightCategory: newWeightCategory });
+    console.log(newWeightCategory);
+    patchData({ weightClass: newWeightCategory });
     history(`/contestants/${id}`);
   };
 
@@ -46,14 +47,14 @@ function ChangeCategoryForm() {
             required
             onChange={(e) => setNewWeightCategory(e.target.value)}
           >
-            <option value="Men Heavy-weight">Light-weight</option>
-            <option value="Men Middle-weight">Middle-weight</option>
-            <option value="Jr. Men Heavy-weight">Middle-weight</option>
-            <option value="Jr. Men Middle-weight">Middle-weight</option>
-            <option value="Women Heavy-weight">Light-weight</option>
-            <option value="Women Middle-weight">Middle-weight</option>
-            <option value="Jr. Women Heavy-weight">Middle-weight</option>
-            <option value="Jr. Women Middle-weight">Middle-weight</option>
+            <option value="Men Heavy-weight">Men Heavy-weight</option>
+            <option value="Men Middle-weight">Men Middle-weight</option>
+            <option value="Jr. Men Heavy-weight">Jr. Men Heavy-weight</option>
+            <option value="Jr. Men Middle-weight">Jr. Men Middle-weight</option>
+            <option value="Women Heavy-weight">Women Heavy-weight</option>
+            <option value="Women Middle-weight">Women Middle-weight</option>
+            <option value="Jr. Women Heavy-weight">Jr. Women Heavy-weight</option>
+            <option value="Jr. Women Middle-weight">Jr. Women Middle-weight</option>
           </select>
           <br/>
           {!isPending && <button type="submit">Update Category</button>}

diff --git a/frontend/src/components/MainView.js b/frontend/src/components/MainView.js
@@ -37,7 +37,7 @@ function MainView() {
     try {
       console.log(filePath);
       const response = await fetch(
-        `${config.backendUrl}/report?saveTo=/D:/raport.pdf`,
+        `${config.backendUrl}/report?saveTo=raport.pdf`,
         {
           method: 'GET',
         },