UNICT-DMI
diff --git a/‎.github/workflows/deploy.yml‎
Lines changed: 0 additions & 50 deletions b/‎.github/workflows/deploy.yml‎
Lines changed: 0 additions & 50 deletions
diff --git a/‎.github/workflows/lint.yml‎
Lines changed: 0 additions & 22 deletions b/‎.github/workflows/lint.yml‎
Lines changed: 0 additions & 22 deletions
diff --git a/‎.github/workflows/main.yml‎
Lines changed: 76 additions & 0 deletions b/‎.github/workflows/main.yml‎
Lines changed: 76 additions & 0 deletions
diff --git a/‎.github/workflows/tests.yml‎
Lines changed: 0 additions & 32 deletions b/‎.github/workflows/tests.yml‎
Lines changed: 0 additions & 32 deletions
diff --git a/‎package.json‎
Lines changed: 1 addition & 1 deletion b/‎package.json‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/app/custom_types/deps-name.ts‎ ‎src/app/custom_types/deps-name.type.ts‎src/app/custom_types/deps-name.ts renamed to src/app/custom_types/deps-name.type.ts b/‎src/app/custom_types/deps-name.ts‎ ‎src/app/custom_types/deps-name.type.ts‎src/app/custom_types/deps-name.ts renamed to src/app/custom_types/deps-name.type.ts
diff --git a/‎src/app/custom_types/means-graph.type.ts‎
Lines changed: 4 additions & 0 deletions b/‎src/app/custom_types/means-graph.type.ts‎
Lines changed: 4 additions & 0 deletions
diff --git a/‎src/app/interfaces/cds.interface.ts‎
Lines changed: 12 additions & 0 deletions b/‎src/app/interfaces/cds.interface.ts‎
Lines changed: 12 additions & 0 deletions
diff --git a/‎src/app/interfaces/graph-config.interface.ts‎
Lines changed: 6 additions & 0 deletions b/‎src/app/interfaces/graph-config.interface.ts‎
Lines changed: 6 additions & 0 deletions
diff --git a/‎src/app/services/cds/cds.service.ts‎
Lines changed: 51 additions & 56 deletions b/‎src/app/services/cds/cds.service.ts‎
Lines changed: 51 additions & 56 deletions
@@ -0,0 +1,76 @@
+name: Opis CI/CD
+
+on:
+  pull_request:
+    branches:
+      - "**"
+  push:
+    branches:
+      - main
+
+permissions:
+  contents: write
+  pages: write
+  id-token: write
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+      - name: Setup Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: "24.13.0"
+      - run: npm ci
+      - run: npm run lint:fix
+
+  test:
+    needs: lint
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+      - name: Setup Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: "24.13.0"
+      - run: npm ci
+      - run: npm run test:coverage
+      - name: Upload coverage report
+        uses: actions/upload-artifact@v4
+        with:
+          name: coverage-report
+          path: coverage
+
+  build:
+    needs: test
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+      - name: Setup Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: "24.13.0"
+      - run: npm ci
+      - run: npm run build
+
+  deploy:
+    needs: build
+    runs-on: ubuntu-latest
+    if: github.event_name == 'push' && github.ref == 'refs/heads/main'  # deploy solo su main
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+      - name: Setup Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: "24.13.0"
+      - run: npm ci
+      - name: Deploy Opis App
+        uses: JamesIves/github-pages-deploy-action@v4
+        with:
+          branch: gh-pages
+          folder: dist/opis-manager
@@ -7,7 +7,7 @@
     "ng": "ng",
     "prestart": "node scripts/set-env.js",
     "start": "ng serve",
-    "build": "ng build",
+    "build": "node scripts/set-env.js && ng build",
     "watch": "ng build --watch --configuration development",
     "lint": "ng lint",
     "lint:fix": "ng lint --fix",
 
@@ -0,0 +1,4 @@
+import { AcademicYear } from '@values/years';
+
+export type Means = [number[], number[][]];
+export type MeansPerYear = Record<AcademicYear, Means>;
@@ -1,4 +1,6 @@
 import { Teaching } from './teaching.interface';
+import { GraphView } from './graph-config.interface';
+import { MeansPerYear } from '@c_types/means-graph.type';
 
 export interface CDS {
   id: number;
@@ -13,3 +15,13 @@ export interface CDS {
   pesi_domande: any;
   insegnamenti: Teaching[];
 }
+
+export interface AllCdsInfoResp {
+  teachings: Teaching[];
+  coarse: MeansPerYear;
+  graphs: {
+    cds_stats: GraphView;
+    // cds_stats_by_year: ChartData,
+    // cds_techings: ChartData
+  };
+}
@@ -0,0 +1,6 @@
+import { ChartData, ChartType } from 'chart.js';
+
+export interface GraphView {
+  type: ChartType;
+  data: ChartData;
+}
@@ -1,65 +1,58 @@
 import { HttpClient, HttpHeaders } from '@angular/common/http';
-import { inject, Injectable, signal } from '@angular/core';
+import { inject, Injectable, ResourceRef, signal } from '@angular/core';
 import { rxResource } from '@angular/core/rxjs-interop';
+import { MeansPerYear } from '@c_types/means-graph.type';
 import { env } from '@env';
-import { CDS } from '@interfaces/cds.interface';
+import { AllCdsInfoResp, CDS } from '@interfaces/cds.interface';
+import { SchedaOpis } from '@interfaces/opis-record.interface';
 import { Teaching } from '@interfaces/teaching.interface';
 import { GraphService } from '@services/graph/graph.service';
+import { typedKeys } from '@utils/object-helpers.utils';
 import { DELAY_API_MS } from '@values/delay-api';
 import { AcademicYear } from '@values/years';
-import {
-  catchError,
-  delay,
-  forkJoin,
-  from,
-  groupBy,
-  map,
-  mergeMap,
-  Observable,
-  throwError,
-  toArray,
-} from 'rxjs';
+import { catchError, delay, forkJoin, map, Observable, throwError } from 'rxjs';
 
 @Injectable({ providedIn: 'root' })
 export class CdsService {
   private readonly BASE_URL = env.api_url + '/cds';
   private readonly _http = inject(HttpClient);
   private readonly _graphService = inject(GraphService);
 
-  private vCds: Record<AcademicYear, number[] | null> = {
-    '2013/2014': null,
-    '2014/2015': null,
-    '2015/2016': null,
-    '2016/2017': null,
-    '2017/2018': null,
-    '2018/2019': null,
-    '2019/2020': null,
-    '2020/2021': null,
-  };
-
   readonly cdsSelected = signal<CDS | null>(null);
 
-  private formatSchedaOpis(resp: CDS[]): void {
-    const cdsSchede = resp
-      .flatMap((cdsCoarse) => cdsCoarse.insegnamenti)
+  private extractValidSchedeOpis(cdsList: CDS[]): SchedaOpis[] {
+    return cdsList
+      .flatMap((cds) => cds.insegnamenti)
       .filter((insegnamento) => insegnamento.schedeopis != null)
       .flatMap((insegnamento) => insegnamento.schedeopis)
       .filter((schedaopis) => schedaopis.domande != null);
+  }
+
+  private groupByYears(schede: SchedaOpis[]): Record<AcademicYear, SchedaOpis[]> {
+    return schede.reduce(
+      (acc, scheda) => {
+        const year = scheda.anno_accademico as AcademicYear;
+        if (!acc[year]) acc[year] = [];
+        acc[year].push(scheda);
+        return acc;
+      },
+      {} as Record<AcademicYear, SchedaOpis[]>,
+    );
+  }
 
-    from(cdsSchede)
-      .pipe(
-        groupBy((scheda) => scheda.anno_accademico),
-        mergeMap((group) => group.pipe(toArray())),
-      )
-      .subscribe((schede) => {
-        const academicYear = schede[0].anno_accademico as AcademicYear;
-
-        this.vCds[academicYear] = this._graphService.elaborateFormula(schede)[0];
-        // debugger
-        //   this.vCds = Object.assign({}, this.vCds); // copy into new object to trigger ngOnChange in child components
-        // this.nCds[academicYear] = this.graphService.round(schede.map(scheda => scheda.totale_schede)
-        //     .reduce((acc, val) => acc + val) / schede.length);
-      });
+  private formatAllYearsCdsStats(resp: CDS[]): MeansPerYear {
+    const cdsSchede = this.extractValidSchedeOpis(resp);
+    const schedeByYears = this.groupByYears(cdsSchede);
+
+    const vCds = {} as MeansPerYear;
+
+    for (const year of typedKeys(schedeByYears)) {
+      const allSchede = schedeByYears[year];
+
+      vCds[year] = this._graphService.elaborateFormulaFor(allSchede);
+    }
+
+    return vCds;
   }
 
   private teachingCdsApi(cds: number): Observable<Teaching[]> {
@@ -75,35 +68,37 @@ export class CdsService {
     );
   }
 
-  private coarsePerCdsApi(unictCds: number): Observable<void> {
-    const url = `${this.BASE_URL}/coarse/${unictCds}/schedeopis`;
+  private cdsStatsApi(unictCdsId: number): Observable<MeansPerYear> {
+    const url = `${this.BASE_URL}/coarse/${unictCdsId}/schedeopis`;
 
     return this._http.get<CDS[]>(url).pipe(
       map((coarse) => {
-        if (!coarse) {
-          throw new Error('Schede OPIS non trovate');
-        }
-        return this.formatSchedaOpis(coarse);
+        if (!coarse) throw new Error('Schede OPIS non trovate');
+        return this.formatAllYearsCdsStats(coarse);
       }),
     );
   }
 
-  public getInfoCds() {
+  public getInfoCds(): ResourceRef<AllCdsInfoResp | undefined> {
     return rxResource({
       params: () => this.cdsSelected(),
       stream: ({ params }) => {
         if (!params?.id || !params?.unict_id) {
           return throwError(() => new Error('Id or Unict_id missing!'));
         }
 
-        const teachings$ = this.teachingCdsApi(params.id);
-        const coarse$ = this.coarsePerCdsApi(params.unict_id);
-
-        return forkJoin({
-          teaching: teachings$,
-          coarse: coarse$,
-        }).pipe(
+        return forkJoin([this.teachingCdsApi(params.id), this.cdsStatsApi(params.unict_id)]).pipe(
           delay(DELAY_API_MS),
+          map(([teachings, coarse]) => {
+            const respDTO: AllCdsInfoResp = {
+              teachings,
+              coarse,
+              graphs: {
+                cds_stats: this._graphService.formatCDSGraph(coarse),
+              },
+            };
+            return respDTO;
+          }),
           catchError((err) => throwError(() => err)),
         );
       },