Skip to content

PSManagementUI
PSManagementUI
Commit 93f2c422 authored by hasan khaddour's avatar hasan khaddour
Browse files
Options

fix s

parent c08bb819
Show whitespace changes
Inline Side-by-side
Showing with 113 additions and 77 deletions
angular.json
View file @ 93f2c422
......@@ -44,7 +44,7 @@
}
],
"styles": [
"@angular/material/prebuilt-themes/azure-blue.css",
"@angular/material/prebuilt-themes/deeppurple-amber.css",
"src/styles.css",
"src/assets/css/app-light.css",
"./node_modules/@fortawesome/fontawesome-free/css/all.min.css",
......
src/app/projects/pages/project-create/project-create.component.html
View file @ 93f2c422
<div class="card col-10">
<div class="card-body">
<h5 class="card-title text-center">طرح مشروع جديد</h5>
<h5 class="card-title text-center"><strong>طرح مشروع جديد</strong></h5>
<!-- Multi Columns Form -->
<form class="row g-3" [formGroup]="projectForm" (ngSubmit)="onSubmit(request)">
......@@ -38,62 +38,86 @@
<hr>
<div class="row mb-4" formGroupName="projectInfo">
<div class="col-4">
<mat-form-field class="example-full-width">
<mat-label for="name" class="form-label">اسم النشاط</mat-label>
<mat-form-field class=" col-4">
<mat-label for="name" class="mat-form-field-label ">اسم النشاط</mat-label>
<input matInput formControlName="name" [value]="request.projectInfo.name" placeholder="اسم المشروع" class="form-control" id="name">
</mat-form-field>
</div>
<div class="col-8 ">
<label for="description" class="form-label">الوصف</label>
<textarea formControlName="description" placeholder="تعريف النشاط " class="form-control"></textarea>
</div>
<mat-form-field class="example-full-width col-8">
<mat-label for="description" class="form-label">وصف النشاط</mat-label>
<textarea matInput formControlName="description" placeholder="تعريف النشاط " class="form-control"></textarea>
</mat-form-field>
</div>
<div class="row" formGroupName="projectInfo">
<div class="col-4">
<label for="code" class="form-label">رمز المشروع</label>
<input formControlName="code" class="form-control" id="code">
</div>
<div class="col-4">
<label for="endDate" class="form-label">تاريخ النهاية المتوقع</label>
<input type="date" formControlName="expectedEndDate" class="form-control" id="endDate">
</div>
<div class="col-4">
<label for="startDate" class="form-label">تاريخ البداية</label>
<input type="date" formControlName="startDate" class="form-control" id="startDate">
</div>
</div>
<div class="row mb-4" formGroupName="projectInfo">
<mat-form-field class="col-4">
<mat-label for="code" class="form-label">رمز المشروع</mat-label>
<input matInput formControlName="code" class="form-control" id="code">
</mat-form-field>
<mat-form-field class="col-4">
<mat-label for="endDate" class="form-label">تاريخ الانتهاء المتوقع</mat-label>
<input formControlName="expectedEndDate" class="form-control" id="endDate" matInput [matDatepicker]="end">
<mat-datepicker-toggle matIconSuffix [for]="end"></mat-datepicker-toggle>
<mat-datepicker #end></mat-datepicker>
</mat-form-field>
<mat-form-field class="col-4">
<mat-label for="startDate" class="form-label">تاريخ البدء بالمشروع</mat-label>
<input formControlName="startDate" class="form-control" id="startDate" matInput [matDatepicker]="start">
<mat-datepicker-toggle matIconSuffix [for]="start"></mat-datepicker-toggle>
<mat-datepicker #start></mat-datepicker>
</mat-form-field>
<div class="row " formGroupName="financialFund">
<div class="col-4">
<label for="source" class="form-label">مصدر التمويل</label>
<input formControlName="source" class="form-control" id="source">
</div>
<div class="col-4">
<label for="financialStatus" class="form-label">وضع التمويل</label>
<input formControlName="financialStatus" class="form-control" id="financialStatus">
</div>
<div class="row mb-4" formGroupName="financialFund">
<mat-form-field class="col-4">
<mat-label for="source" class="form-label">مصدر التمويل</mat-label>
<input formControlName="source" class="form-control" id="source" matInput />
</mat-form-field>
<mat-form-field class="col-4">
<mat-label for="financialStatus" class="form-label" >وضع التمويل</mat-label>
<input formControlName="financialStatus" class="form-control" id="financialStatus" matInput />
</mat-form-field>
</div>
<div class="row" formGroupName="projectAggreement">
<div class="col-4">
<mat-form-field>
<mat-label>تاريخ كتاب الموافقة</mat-label>
<input matInput [matDatepicker]="picker">
<mat-hint>MM/DD/YYYY</mat-hint>
<mat-datepicker-toggle matIconSuffix [for]="picker"></mat-datepicker-toggle>
<mat-datepicker #picker></mat-datepicker>
<input formControlName="aggreementDate" class="form-control" id="source" matInput [matDatepicker]="aggreement">
<mat-datepicker-toggle matIconSuffix [for]="aggreement"></mat-datepicker-toggle>
<mat-datepicker #aggreement></mat-datepicker>
</mat-form-field>
</div>
<mat-form-field class="col-4">
<mat-label for="aggreementNumber" class="form-label">رقم كتاب الموافقة</mat-label>
<input formControlName="aggreementNumber" class="form-control" id="aggreementNumber" matInput/>
</mat-form-field>
</div>
<div class="row" formGroupName="proposalInfo">
<div class="col-4">
<label for="aggreementNumber" class="form-label">رقم كتاب الموافقة</label>
<input formControlName="aggreementNumber" class="form-control" id="aggreementNumber">
<mat-form-field>
<mat-label>تاريخ كتاب الطرح</mat-label>
<input formControlName="proposingBookDate" class="form-control" id="proposingBookDate" matInput [matDatepicker]="proposingBookDate">
<mat-datepicker-toggle matIconSuffix [for]="proposingBookDate"></mat-datepicker-toggle>
<mat-datepicker #proposingBookDate></mat-datepicker>
</mat-form-field>
</div>
<mat-form-field class="col-4">
<mat-label for="proposingBookNumber" class="form-label">رقم كتاب الطرح</mat-label>
<input formControlName="proposingBookNumber" class="form-control" id="proposingBookNumber" matInput/>
</mat-form-field>
</div>
<div class="col-4" formGroupName="executerId">
......@@ -107,25 +131,28 @@
</div>
<div class="row" formGroupName="projectClassification">
<div class="col-4">
<label for="projectStatus" class="form-label">وضع النشاط</label>
<input formControlName="projectStatus" class="form-control" id="projectStatus">
</div>
<div class="col-4">
<label for="projectNature" class="form-label">طبيعة النشاط</label>
<input formControlName="projectNature" class="form-control" id="projectNature">
</div>
<div class="col-4">
<label for="projectType" class="form-label">نوع النشاط</label>
<input formControlName="projectType" class="form-control" id="projectType">
</div>
<div class="row mb-4" formGroupName="projectClassification">
<mat-form-field class="col-4">
<mat-label for="projectStatus" class="form-label" >وضع النشاط</mat-label>
<input formControlName="projectStatus" class="form-control" id="projectStatus" matInput />
</mat-form-field>
<mat-form-field class="col-4">
<mat-label for="projectNature" class="form-label" >طبيعة النشاط</mat-label>
<input formControlName="projectNature" class="form-control" id="projectNature" matInput />
</mat-form-field>
<mat-form-field class="col-4">
<mat-label for="projectType" class="form-label" >وضع النشاط</mat-label>
<input formControlName="projectType" class="form-control" id="projectType" matInput />
</mat-form-field>
</div>
<hr>
<div class="text-center">
<button type="submit" class="btn btn-primary">Submit</button>
<button type="submit" class="btn btn-primary">إضافة</button>
</div>
</form><!-- End Multi Columns Form -->
......
src/app/projects/pages/project-create/project-create.component.ts
View file @ 93f2c422
......@@ -8,6 +8,7 @@ import { Project } from '../../models/responses/project';
import { Customer } from '../../../customers/models/customer';
import { CustomerService } from '../../../customers/services/customer.service';
import { CreateProjectRequest } from '../../models/requests/createProjectRequest';
import { ProjectService } from '../../services/project.service';
@Component({
selector: 'project-create',
......@@ -28,7 +29,8 @@ export class ProjectCreateComponent {
constructor(
private fb: FormBuilder,
private employeeService: EmployeesService,
private customersService : CustomerService
private customersService : CustomerService,
private projectService :ProjectService
) {}
ngOnInit(): void {
......@@ -55,7 +57,8 @@ export class ProjectCreateComponent {
aggreementNumber: ['', Validators.required],
}),
proposalInfo: this.fb.group({
// Add any fields needed here
proposingBookNumber :['', Validators.required],
proposingBookDate :['', Validators.required]
}),
projectClassification: this.fb.group({
projectStatus: ['', Validators.required],
......@@ -113,6 +116,11 @@ export class ProjectCreateComponent {
}
onSubmit(request : CreateProjectRequest){
console.log(request);
if(this.projectForm.valid){
console.log(true)
}
}
}
src/styles.css
View file @ 93f2c422
.mat-form-field {
color: #7722ff !important; /* Changes the color of the label */
background-color: #012970;
}
.mat-input-element {
color: #26ff22; /* Changes the color of the input text */
}
.custom-field {
color: #0003b0;
.mat-form-field-label {
font-size: 1em;
.mat-hint {
color: #ff5722; /* Changes the color of the hint */
}
.mat-form-field-underline .mat-form-field-ripple {
background-color: #ff5722; /* Changes the color of the underline */
}
.mat-input-element {
background-color: #012970;
}
.mat-form-field-underline {
background-color: #4caf50; /* Underline color */
}
.mat-form-field-ripple {
background-color: #4caf50; /* Ripple effect color */
}
}
.mat-form-field.mat-focused .mat-form-field-label {
color: #ff5722; /* Changes the color of the label when focused */
.custom-card {
background-color: white; /* White background for the card */
color: black; /* Black text color */
box-shadow: 0 4px 6px rgba(0, 0, 0, 0.1); /* Optional: Adds a subtle shadow */
border-radius: 8px; /* Optional: Rounds the corners */
}
.accordion-button::after {
flex-shrink: 0;
width: var(--bs-accordion-btn-icon-width);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

HIAST - GitLab