Tiny changes: changed name of folder demande, and fixed bug creation of formation with no image with just a single line (!=null), and cascade remove demandes when i delete formation, thank you for visiting!

Author: walidbosso

angular-frontend/src/app/Admin/demande/demande-routing.module.ts

@@ -0,0 +1,13 @@
+import { NgModule } from '@angular/core';
+import { RouterModule, Routes } from '@angular/router';
+
+
+const routes: Routes = [
+
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule],
+})
+export class DemandeRoutingModule {}

angular-frontend/src/app/Admin/formation copy/demande.module.ts angular-frontend/src/app/Admin/demande/demande.module.ts

@@ -8,9 +8,7 @@ import { DemandeComponent } from './list-demandes/list-demandes.component';
 @NgModule({
   declarations: [
 
-   // DashboardComponent,
     DemandeComponent,
-    // OneDemandeComponent,
   ],
   imports: [
     CommonModule,

angular-frontend/src/app/Admin/formation copy/demande.service.ts angular-frontend/src/app/Admin/demande/demande.service.ts

@@ -26,7 +26,7 @@ export class DemandeService {
   }
 
 
-  // POST ADD GETS CALLED IN HOME
+  // ADD DEMANDE, first we add formateur to his DB then we take him and add it to demande db
   async addDemande(request: any): Promise<any> {
     console.log("addDemande service " + request);
 
@@ -36,11 +36,9 @@ export class DemandeService {
       // Perform the formateur/add request
       const response = await axios.post(`/formateur/add`, request.formateur, { headers });
 
-      // Handle the response
-      this.formatorData = response.data;
+      this.formatorData = response.data; 
       console.log("/formateur/add RESPONSE " + this.formatorData.name);
 
-      // Build the request data for /demande/add
       const reqData = {
         id: Math.random(),
         formateur: this.formatorData,
@@ -55,7 +53,7 @@ export class DemandeService {
       return demandeResponse;
     } catch (error) {
       console.error(error);
-      throw error; // Rethrow the error to be caught by the calling function/component
+      throw error; 
     }
   }
 

angular-frontend/src/app/Admin/formation copy/demande.ts angular-frontend/src/app/Admin/demande/demande.ts

@@ -19,7 +19,7 @@ export class DemandeComponent implements OnInit {
   ) {}
 
   ngOnInit() {
-    this.getAllDemandes(); // on loand we call the function below
+    this.getAllDemandes(); // on load we call the function below
     this.permission = this.userAuthsService.isAdmin();
   }
 
@@ -42,7 +42,6 @@ export class DemandeComponent implements OnInit {
   }
   fetchImageForDemande(Demande: any): void {
     this.DemandeService.getDemandeById(Demande.id).then((response) => {
-      // Assuming the image data is in response.data.image_data
       Demande.image_data = response.data.image_data;
     });
   }

angular-frontend/src/app/Admin/formation copy/list-demandes/list-demandes.component.css angular-frontend/src/app/Admin/demande/list-demandes/list-demandes.component.css

@@ -1,5 +1,5 @@
 import { Component, OnInit } from '@angular/core';
-import { DemandeService } from 'app/Admin/formation copy/demande.service';
+import { DemandeService } from 'app/Admin/demande/demande.service';
 import { UserAuthsService } from 'app/services/user-auths.service';
 
 declare const $: any;
@@ -9,7 +9,7 @@ interface RouteInfo {
   title: string;
   icon: string;
   class: string;
-  role: boolean;
+  role: boolean; 
 }
 
 export let ROUTES: RouteInfo[] = [];

angular-frontend/src/app/Admin/formation copy/list-demandes/list-demandes.component.html angular-frontend/src/app/Admin/demande/list-demandes/list-demandes.component.html

@@ -1,8 +1,8 @@
 import { Component, OnInit } from '@angular/core';
 import { FormControl, FormGroup, Validators } from '@angular/forms';
 import { ActivatedRoute, Router } from '@angular/router';
-import { Demande } from 'app/Admin/formation copy/demande';
-import { DemandeService } from 'app/Admin/formation copy/demande.service';
+import { Demande } from 'app/Admin/demande/demande';
+import { DemandeService } from 'app/Admin/demande/demande.service';
 import { Formation } from 'app/Admin/formation/formation';
 import { FormationService } from 'app/Admin/formation/formation.service';
 import { Formator } from 'app/model/formator.model';

angular-frontend/src/app/Admin/formation copy/list-demandes/list-demandes.component.spec.ts angular-frontend/src/app/Admin/demande/list-demandes/list-demandes.component.spec.ts

@@ -19,3 +19,4 @@
     </div>
   </div>
 </div>
+ 

angular-frontend/src/app/Admin/formation copy/list-demandes/list-demandes.component.ts angular-frontend/src/app/Admin/demande/list-demandes/list-demandes.component.ts

@@ -16,7 +16,7 @@ import { CalendarComponent } from 'app/Admin/calendar/calendar.component';
 import { Logout } from '../../Admin/logout/logout.component';
 import { AdminLayoutComponent } from './admin-layout.component';
 import { NomFormationComponent } from 'app/Admin/formation/nom-formation/nom-formation.component';
-import { DemandeComponent } from 'app/Admin/formation copy/list-demandes/list-demandes.component';
+import { DemandeComponent } from 'app/Admin/demande/list-demandes/list-demandes.component';
 // import { OneDemandeComponent } from 'app/Admin/formation copy/one-demande/one-demande.component';
 
 export const AdminLayoutRoutes: Routes = [

angular-frontend/src/app/Admin/formation copy/demande-routing.module.ts

@@ -5,8 +5,10 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 
+import jakarta.persistence.CascadeType;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
@@ -49,10 +51,10 @@ public class Formation {
     private String imageName;
 
     // Formation accepts one and only one formateur, formateur can be in many formation, has a list of formations he is affected to
-    @ManyToOne()
+    @ManyToOne(cascade = {CascadeType.PERSIST, CascadeType.MERGE, CascadeType.REFRESH})
     private UserInfo formateur;
 
-    @ManyToOne()
+    @ManyToOne(cascade = {CascadeType.PERSIST, CascadeType.MERGE, CascadeType.REFRESH})
     private Entreprise entreprise;
 
     @ManyToMany
@@ -63,7 +65,7 @@ public class Formation {
     )
     private List<Individu> individus;
 
-    @OneToMany(mappedBy = "formation") 
+    @OneToMany(mappedBy = "formation", cascade = CascadeType.REMOVE) 
 	@JsonIgnore 
 	List<Demande> demandes; 
 }

angular-frontend/src/app/components/sidebar/sidebar.component.ts

@@ -50,10 +50,11 @@ public List<Individu> findIndividusByFormationId( Long id) {
 
 	 public Formation addFormation(Formation formation, MultipartFile imageFile) throws java.io.IOException {
 	        try {
+	        	if(imageFile!=null) {
 	            formation.setImageName(imageFile.getOriginalFilename());
 
 	            byte[] imageData = imageFile.getBytes();
-	            formation.setImageData(imageData);
+	            formation.setImageData(imageData);}
 
 	            return formationRepository.save(formation);
 	        } catch (IOException e) {