RIFFMASTER: FRONTEND: add groupColor property to the Riff model

Backend/Spring/.idea/workspace.xml

@@ -12,7 +12,7 @@
     <list default="true" id="8315de53-8c15-472c-a710-45938463dc02" name="Changes" comment="RIFFMASTER: add frontend files">
       <change beforePath="$PROJECT_DIR$/../../Frontend/RiffMasterFront/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../../Frontend/RiffMasterFront/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/../../Frontend/RiffMasterFront/src/app/Services/song.service.ts" beforeDir="false" afterPath="$PROJECT_DIR$/../../Frontend/RiffMasterFront/src/app/Services/song.service.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../../Frontend/RiffMasterFront/src/app/main-page/main-page.component.ts" beforeDir="false" afterPath="$PROJECT_DIR$/../../Frontend/RiffMasterFront/src/app/main-page/main-page.component.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../../Frontend/RiffMasterFront/src/app/models/riff.ts" beforeDir="false" afterPath="$PROJECT_DIR$/../../Frontend/RiffMasterFront/src/app/models/riff.ts" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -215,7 +215,7 @@
       <workItem from="1686820558130" duration="622000" />
       <workItem from="1686836941887" duration="14004000" />
       <workItem from="1686898654444" duration="1889000" />
-      <workItem from="1686909268841" duration="15278000" />
+      <workItem from="1686909268841" duration="15333000" />
     </task>
     <task id="LOCAL-00001" summary="add basic hello world and transfering data to server">
       <created>1679575346987</created>

Backend/Spring/src/main/java/pl/dmcs/jwoszczyk/domain/Riff.java

@@ -18,6 +18,7 @@ public class Riff {
 	private String name;
 	private double startMs;
 	private double endMs;
+
 	@ManyToOne(fetch = FetchType.EAGER)
 	@JoinColumn(name = "song_id")
 	@JsonBackReference

Frontend/RiffMasterFront/.angular/cache/16.0.4/babel-webpack/66152333af8b1dc162a669567b5c375ef41260cb6e3a4dc214a666e1fe71d1c9.json

@@ -0,0 +1 @@
+{"ast":null,"code":"export class Riff {\n  constructor(id, name, startMs, endMs, groupColor) {\n    this.id = id;\n    this.name = name;\n    this.startMs = startMs;\n    this.endMs = endMs;\n    this.groupColor = groupColor;\n  }\n}","map":{"version":3,"names":["Riff","constructor","id","name","startMs","endMs","groupColor"],"sources":["C:\\Users\\Kuba\\Desktop\\studia\\WPFt\\RiffMaster web application\\Frontend\\RiffMasterFront\\src\\app\\models\\riff.ts"],"sourcesContent":["export class Riff {\r\n  id: number;\r\n  name: string;\r\n  startMs: number;\r\n  endMs: number;\r\n  groupColor: string;\r\n\r\n  constructor(id: number, name: string, startMs: number, endMs: number, groupColor: string) {\r\n    this.id = id;\r\n    this.name = name;\r\n    this.startMs = startMs;\r\n    this.endMs = endMs;\r\n    this.groupColor = groupColor;\r\n  }\r\n}\r\n"],"mappings":"AAAA,OAAM,MAAOA,IAAI;EAOfC,YAAYC,EAAU,EAAEC,IAAY,EAAEC,OAAe,EAAEC,KAAa,EAAEC,UAAkB;IACtF,IAAI,CAACJ,EAAE,GAAGA,EAAE;IACZ,IAAI,CAACC,IAAI,GAAGA,IAAI;IAChB,IAAI,CAACC,OAAO,GAAGA,OAAO;IACtB,IAAI,CAACC,KAAK,GAAGA,KAAK;IAClB,IAAI,CAACC,UAAU,GAAGA,UAAU;EAC9B"},"metadata":{},"sourceType":"module","externalDependencies":[]}

Frontend/RiffMasterFront/.idea/workspace.xml

@@ -6,6 +6,7 @@
   <component name="ChangeListManager">
     <list default="true" id="d91bc08d-d968-4797-8fb3-ef602a37db2a" name="Changes" comment="RIFFMASTER: add frontend business logic (riff, song)">
       <change beforePath="$PROJECT_DIR$/../../Backend/Spring/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../../Backend/Spring/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../../Backend/Spring/src/main/java/pl/dmcs/jwoszczyk/domain/Riff.java" beforeDir="false" afterPath="$PROJECT_DIR$/../../Backend/Spring/src/main/java/pl/dmcs/jwoszczyk/domain/Riff.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -97,7 +98,7 @@
       <workItem from="1686820564623" duration="521000" />
       <workItem from="1686836939723" duration="5206000" />
       <workItem from="1686898660229" duration="4682000" />
-      <workItem from="1686909264196" duration="7475000" />
+      <workItem from="1686909264196" duration="8088000" />
     </task>
     <task id="LOCAL-00001" summary="RIFFMASTER: add frontend project">
       <created>1685976235580</created>

Frontend/RiffMasterFront/src/app/Services/song.service.ts

@@ -43,7 +43,8 @@ export class SongService {
               0,
               riffXml.Name[0],
               riffXml.StartMs[0],
-              riffXml.EndMs[0]
+              riffXml.EndMs[0],
+              riffXml.GroupColor[0]
             );
           });
 
@@ -76,6 +77,7 @@ export class SongService {
         riffXml.ele('Name', riff.name);
         riffXml.ele('StartMs', riff.startMs);
         riffXml.ele('EndMs', riff.endMs);
+        riffXml.ele('GroupColor', riff.groupColor);
         riffXml.up();
       }
     }

Frontend/RiffMasterFront/src/app/main-page/main-page.component.html

@@ -109,8 +109,13 @@
           <td mat-cell *matCellDef="let riff">{{ riff.endMs }}</td>
         </ng-container>
 
-        <tr mat-header-row *matHeaderRowDef="['name', 'startMs', 'endMs']"></tr>
-        <tr mat-row *matRowDef="let row; columns: ['name', 'startMs', 'endMs']"></tr>
+        <ng-container matColumnDef="groupColor">
+          <th mat-header-cell *matHeaderCellDef>GroupColor</th>
+          <td mat-cell *matCellDef="let riff">{{ riff.groupColor }}</td>
+        </ng-container>
+
+        <tr mat-header-row *matHeaderRowDef="['name', 'startMs', 'endMs', 'groupColor']"></tr>
+        <tr mat-row *matRowDef="let row; columns: ['name', 'startMs', 'endMs', 'groupColor']"></tr>
       </table>
     </mat-card-content>
 

Frontend/RiffMasterFront/src/app/models/riff.ts

@@ -3,11 +3,13 @@ export class Riff {
   name: string;
   startMs: number;
   endMs: number;
+  groupColor: string;
 
-  constructor(id: number, name: string, startMs: number, endMs: number) {
+  constructor(id: number, name: string, startMs: number, endMs: number, groupColor: string) {
     this.id = id;
     this.name = name;
     this.startMs = startMs;
     this.endMs = endMs;
+    this.groupColor = groupColor;
   }
 }