Skip to content

Commit

Permalink
Merge pull request #92 from Ginkishi/Validation
Browse files Browse the repository at this point in the history 
Validation
  • Loading branch information
@yasminehadjout
yasminehadjout authored Apr 9, 2020
2 parents 99b6d5e + c18689a commit 6eff1cf
Show file tree
Hide file tree
Showing 4 changed files with 87 additions and 47 deletions.
6 changes: 2 additions & 4 deletions api/index.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -151,9 +151,7 @@
$s = new InterventionController();
$data = json_decode(file_get_contents('php://input'), true);

if ($data["Ronde"] == "" || $data["Ronde"] == null) {
$data["Ronde"] = 0;
}

$s->addVehiculeToIntervention($data["IdVehicule"], $data["IDIntervention"], $data["DateDepart"], $data["HeureDepart"], $data["DateArrive"], $data["HeureArrive"], $data["DateRetour"], $data["HeureRetour"], $data["Ronde"]);
});
$router->get('/intervention1/:numeroIntervention/:dateDeclenchement/:heureDeclenchement', function ($numeroIntervention, $dateDeclenchement, $heureDeclenchement) {
Expand Down Expand Up @@ -185,7 +183,7 @@
require_once CONTROLLERS . DS . 'interventionC.php';
$s = new InterventionController();
$data = json_decode(file_get_contents('php://input'), true);
$s->addIntervention($data["numeroIntervention"], $data["adresse"], $data["commune"], 1, $data["typeIntervention"], $data["important"], $data["requerant"], $data["dateDeclenchement"], $data["heureDeclenchement"], $data["dateFin"], $data["heureFin"], $data["responsable"], $data["idcreateur"], $data["statut"]);
$s->addIntervention($data["numeroIntervention"], $data["adresse"], $data["commune"], $data["opm"], $data["typeIntervention"], $data["important"], $data["requerant"], $data["dateDeclenchement"], $data["heureDeclenchement"], $data["dateFin"], $data["heureFin"], $data["responsable"], $data["idcreateur"], $data["statut"]);
});

// Get one intervention by id
Expand Down
17 changes: 16 additions & 1 deletion api/models/interventionM.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -198,8 +198,17 @@ public function addIntervention($numIntervention, $adresse, $commune, $opm, $typ
$datedec = $dateDeclenchement . " " . $heureDeclenchement;
$result = Pompier::getPompierID($res[0], $res[1])->fetch();
$idresp = $result[0];

echo $opm;
echo $important;
$datef = $dateFin . " " . $heureFin;
if($opm==true)
$opm=1;
else
$opm=0;
if($important==true)
$important=1;
else
$important=0;


$sql = "INSERT INTO interventions (NIntervention, OPM, Commune, Adresse, TypeIntervention, Important, Requerant, DateDeclenchement, DateFin, IDResponsable, IDCreateur,IDstatus) VALUES('$numIntervention',$opm,'$commune','$adresse','$typeIntervention',$important,'$requerant','$datedec','$datef',$idresp,$idcreateur,$status);";
Expand Down Expand Up @@ -262,7 +271,13 @@ public function addVehiculeToIntervention($IdVehicule, $IDintervention, $datede

$dateretour = $dateretour . " " . $heureretour;

if($ronde==true)
{$ronde=1;

}
else{
$ronde=0;
}
$sql = "INSERT INTO `vehiculeutilise` (IDVehicule, IDIntervention, DateDepart, DateArrive, DateRetour,Ronde) VALUES($IdVehicule,$IDintervention,'$datedepart','$datearrive', '$dateretour',$ronde);";


Expand Down
36 changes: 22 additions & 14 deletions app/src/app/interventions/intervention-add/intervention-add.component.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import { VehiculeUtilise } from "src/app/models/vehiculeutilise";
import { NotExpr } from '@angular/compiler';
import { PompierRoles } from 'src/app/models/pompierRoles';
import { stringify } from 'querystring';

import { Router, ActivatedRoute } from "@angular/router";
@Component({
selector: "app-intervention-add",
templateUrl: "./intervention-add.component.html",
Expand All @@ -27,8 +27,8 @@ export class InterventionAddComponent implements OnInit {
adresse: null,
typeIntervention: null,
requerant: "Alerte locale",
opm: 0,
important: 0,
opm: 1,
important: 1,
dateDeclenchement: "2020-03-31",
heureDeclenchement:"16:52",
dateFin: "2020-03-31",
Expand All @@ -51,7 +51,7 @@ export class InterventionAddComponent implements OnInit {
HeureArrive: null,
DateRetour: null,
HeureRetour: null,
Ronde: null
Ronde:null
};
nbvehicule:Number=0;
listePompier: string[] = [];
Expand All @@ -76,6 +76,7 @@ export class InterventionAddComponent implements OnInit {
private apiService: BrigadeApiService,
private dataService: DataService,
private fb:FormBuilder,
private router: Router
) {}

ngOnInit(): void {
Expand Down Expand Up @@ -140,7 +141,7 @@ export class InterventionAddComponent implements OnInit {
buildVehicule(): FormGroup{
return this.fb.group({
vehicule: "",
ronde:'false',
ronde:false,
dateDepart:formatDate(
new Date(),
"yyyy-MM-dd",
Expand Down Expand Up @@ -261,6 +262,9 @@ export class InterventionAddComponent implements OnInit {
// console.log(this.vehicules);
});
}
async delay(ms: number) {
await new Promise(resolve => setTimeout(()=>resolve(), ms)).then(()=>console.log("fired"));
}
createListAllPompier(): void {
this.apiService.readAllPompier().subscribe((resultat: Pompier[]) => {
// console.log(resultat);
Expand Down Expand Up @@ -295,19 +299,19 @@ export class InterventionAddComponent implements OnInit {


console.log("------------------",this.AddInterventionForm.value);
// console.log('saved'+JSON.stringify(this.AddInterventionForm.value));
console.log("-----------numerointer ",this.AddInterventionForm.value.numeroIntervention);

console.log('saved'+JSON.stringify(this.AddInterventionForm.value));


console.log("-----------numerointer ",this.AddInterventionForm.value.numeroIntervention);

this.interventionForm.numeroIntervention=this.AddInterventionForm.value.numeroIntervention;
this.interventionForm.commune=this.AddInterventionForm.value.commune;
this.interventionForm.adresse=this.AddInterventionForm.value.adresse;
this.interventionForm.typeIntervention=this.AddInterventionForm.value.typeIntervention;
this.interventionForm.requerant=this.AddInterventionForm.value.requerant;
this.interventionForm.opm=this.AddInterventionForm.value.opm;
console.log(this.AddInterventionForm.value.important);
if(this.AddInterventionForm.value.important=="false")
this.interventionForm.important=0;
else this.interventionForm.important=1;
this.interventionForm.important=this.AddInterventionForm.value.important;
this.interventionForm.dateDeclenchement=this.AddInterventionForm.value.dateDeclenchement;
this.interventionForm.dateFin=this.AddInterventionForm.value.dateFin;
this.interventionForm.heureDeclenchement=this.AddInterventionForm.value.heureDeclenchement;
Expand Down Expand Up @@ -380,9 +384,13 @@ export class InterventionAddComponent implements OnInit {
}

);


}

this.delay(2000).then(any=>{
this.router.navigate(["intervention/"+ this.interventionID]);
});

}


}

Expand Down
75 changes: 47 additions & 28 deletions app/src/app/interventions/intervention-edit/intervention-edit.component.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import { Intervention } from 'src/app/models/intervention';
import { PersonnelIntervention } from 'src/app/models/personnelIntervention';
import { VehiculeIntervention } from 'src/app/models/vehiculeIntervention';
import { Modification } from 'src/app/models/modification';
import { Router} from "@angular/router";
@Component({
selector: "app-intervention-edit",
templateUrl: "./intervention-edit.component.html",
Expand Down Expand Up @@ -83,7 +84,8 @@ export class InterventionEditComponent implements OnInit {
private apiService: BrigadeApiService,
private dataService: DataService,
private fb: FormBuilder,
public routeActive: ActivatedRoute
public routeActive: ActivatedRoute,
private router: Router
) { }
getID() {
this.idIntervention = this.routeActive.snapshot.params.id;
Expand Down Expand Up @@ -136,6 +138,16 @@ export class InterventionEditComponent implements OnInit {
.subscribe((res: Pompier) => {
this.response = JSON.parse(JSON.stringify(res));
this.responsable = this.response.pompier[0];
let op:boolean;
let im:boolean;
if(this.intervention.OPM==1)
op=true;
else op=false;

if(this.intervention.Important==1)
im=true;
else im=false;

let splitteddatedeclenchement = this.intervention.DateDeclenchement.toString().split(" ");
let splitteddatedefin = this.intervention.DateFin.toString().split(" ");
this.AddInterventionForm = this.fb.group({
Expand All @@ -144,8 +156,8 @@ export class InterventionEditComponent implements OnInit {
adresse: this.intervention.Adresse,
typeIntervention: this.intervention.TypeIntervention,
requerant: this.intervention.Requerant,
opm: this.intervention.OPM,
important: this.intervention.Important,
opm: op,
important: im,
dateDeclenchement: splitteddatedeclenchement[0],
heureDeclenchement: splitteddatedeclenchement[1],
dateFin: splitteddatedefin[0],
Expand All @@ -167,7 +179,7 @@ export class InterventionEditComponent implements OnInit {
let modif:Modification= new Modification();
this.dataService.getRemarques(this.idIntervention).subscribe(
result =>
{ console.log("--------------resutl171",result);
{// console.log("--------------resutl171",result);
this.AddInterventionForm.patchValue({
remarque: JSON.parse(JSON.stringify(result)).modification
});
Expand Down Expand Up @@ -220,9 +232,14 @@ export class InterventionEditComponent implements OnInit {
let splitedatedepart = v.DateDepart.toString().split(" ");
let spliteddatearrivee = v.DateArrive.toString().split(" ");
let spliteddateretour = v.DateRetour.toString().split(" ");
let ron:boolean;
if(v.Ronde==1)
ron=true;
else
ron=false;
return this.fb.group({
vehicule: v.IDVehicule,
ronde: v.Ronde,
ronde: ron,
dateDepart: splitedatedepart[0],
heureDepart: splitedatedepart[1],
dateArrivee: spliteddatearrivee[0],
Expand Down Expand Up @@ -272,7 +289,7 @@ export class InterventionEditComponent implements OnInit {
buildVehicule(): FormGroup {
return this.fb.group({
vehicule: "",
ronde: 'false',
ronde: false,
dateDepart: formatDate(
new Date(),
"yyyy-MM-dd",
Expand Down Expand Up @@ -417,7 +434,9 @@ export class InterventionEditComponent implements OnInit {
}
// rajouter l'equipe d'apres le vehicule selectionnée


async delay(ms: number) {
await new Promise(resolve => setTimeout(()=>resolve(), ms)).then(()=>console.log("fired"));
}
selectEvent(item: string) {
this.interventionForm.responsable = item;
}
Expand All @@ -432,7 +451,7 @@ export class InterventionEditComponent implements OnInit {

}
onSubmit() {
console.log("---------435------",this.status);
// console.log("---------435------",this.status);


// suppression
Expand All @@ -442,8 +461,8 @@ export class InterventionEditComponent implements OnInit {

///ajout
// console.log(this.AddInterventionForm.value);
console.log('saved'+JSON.stringify(this.AddInterventionForm.value));
console.log("-----------numerointer ", this.AddInterventionForm.value.numeroIntervention);
// console.log('saved'+JSON.stringify(this.AddInterventionForm.value));
// console.log("-----------numerointer ", this.AddInterventionForm.value.numeroIntervention);

this.interventionForm.numeroIntervention = this.AddInterventionForm.value.numeroIntervention;
this.interventionForm.commune = this.AddInterventionForm.value.commune;
Expand All @@ -452,9 +471,7 @@ export class InterventionEditComponent implements OnInit {
this.interventionForm.requerant = this.AddInterventionForm.value.requerant;
this.interventionForm.opm = this.AddInterventionForm.value.opm;
console.log(this.AddInterventionForm.value.important);
if (this.AddInterventionForm.value.important == "false")
this.interventionForm.important = 0;
else this.interventionForm.important = 1;
this.interventionForm.important = this.AddInterventionForm.value.important;
this.interventionForm.dateDeclenchement = this.AddInterventionForm.value.dateDeclenchement;
this.interventionForm.dateFin = this.AddInterventionForm.value.dateFin;
this.interventionForm.heureDeclenchement = this.AddInterventionForm.value.heureDeclenchement;
Expand All @@ -463,16 +480,16 @@ export class InterventionEditComponent implements OnInit {
this.interventionForm.idcreateur = JSON.parse(localStorage.getItem("user")).P_ID;
this.interventionForm.statut=this.status;

console.log("------------conntent397 ",this.interventionForm);
// console.log("------------conntent397 ",this.interventionForm);
// console.log("in onSubmit:");

//ajout d'une intervention
this.dataService.postInterventionForm(this.interventionForm).subscribe(
result => {
console.log("success hallelujah", result);
// console.log("success hallelujah", result);
var c: VehiculeUtilise;
for (let vi of this.AddInterventionForm.value.vehiculesintervention) {
console.log("vi-------",vi);
// console.log("vi-------",vi);
c = {
IdVehicule: vi.vehicule,
IDIntervention: this.interventionID,
Expand All @@ -486,15 +503,15 @@ export class InterventionEditComponent implements OnInit {
};

if(this.status==2) // chef de corps demande modif
{ console.log("---------526--------");
{// console.log("---------526--------");
let modif:Modification= new Modification();
modif.Id=this.interventionID;
modif.modif=this.AddInterventionForm.value.modification;
console.log("--------530----------",modif);
// console.log("--------530----------",modif);
this.dataService.setRemarques(modif).subscribe(
result =>
{
console.log("success", JSON.parse(JSON.stringify(result)));
// console.log("success", JSON.parse(JSON.stringify(result)));
},
error => console.log("erreur", error)
);
Expand All @@ -519,25 +536,25 @@ export class InterventionEditComponent implements OnInit {
// console.log("success", JSON.parse(JSON.stringify(result)));

for (let pom of vi.roles) {
console.log(pom);
console.log(c.IdVehicule);
// console.log(pom);
// console.log(c.IdVehicule);
if (pom.roleid !== '0' || pom.pompiername != "") {
console.log(pom.roleid);
// console.log(pom.roleid);
this.dataService.postMembertoInntervention(vi.vehicule, this.interventionID, pom.roleid, pom.pompiername).subscribe(
result => {
console.log("success", JSON.parse(JSON.stringify(result)));
// console.log("success", JSON.parse(JSON.stringify(result)));
},
error => console.log("erreur", error)
);
}
else
if(pom.roleid=='0' && pom.pompiername!="")
{
console.log(c.IdVehicule,this.interventionID,pom.roleid,pom.pompiername);
// console.log(c.IdVehicule,this.interventionID,pom.roleid,pom.pompiername);
this.dataService.postMembertoInntervention(c.IdVehicule,this.interventionID,pom.roleid,pom.pompiername).subscribe(
result =>
{
console.log("success", JSON.parse(JSON.stringify(result)));
// console.log("success", JSON.parse(JSON.stringify(result)));
},
error => console.log("erreur", error)
);
Expand All @@ -561,9 +578,11 @@ export class InterventionEditComponent implements OnInit {

}
);




this.delay(2000).then(any=>{
this.router.navigate(["intervention/"+ this.interventionID]);
});


}

Expand Down

0 comments on commit 6eff1cf

Please sign in to comment.