diff --git a/frontend/angular-clarity-master/src/app/modules/main/datamanagement/datamanagement/datamanagement.component.html b/frontend/angular-clarity-master/src/app/modules/main/datamanagement/datamanagement/datamanagement.component.html
index 63c652d..b45ed70 100644
--- a/frontend/angular-clarity-master/src/app/modules/main/datamanagement/datamanagement/datamanagement.component.html
+++ b/frontend/angular-clarity-master/src/app/modules/main/datamanagement/datamanagement/datamanagement.component.html
@@ -1,7 +1,7 @@
- - Data Management
- - Data Management
+ - Data Management
+ - Data Management
@@ -14,21 +14,22 @@
-
-
+
Loading ...
- {{error}}
+ {{error}}
+
-
+
Go To
-
+
@@ -36,25 +37,27 @@
Entity Name
-
+
- File Name
-
-
- Action
+ File Name
-
- Workflow
- {{user.entityName}}
+
+ Action
+
+
+ Workflow
+ {{user.entity_name}}
{{user.file_name}}
-
+
-
- Delete
+
+ Delete
- Edit
+ Edit
@@ -94,7 +97,7 @@
-
@@ -108,8 +111,8 @@
+ UPDATE
+
@@ -122,7 +125,7 @@
{{rowSelected.id}}
@@ -157,17 +160,17 @@
-
-
+
+
+ ADD
+
-
+
-
+
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/datamanagement/datamanagement/datamanagement.component.ts b/frontend/angular-clarity-master/src/app/modules/main/datamanagement/datamanagement/datamanagement.component.ts
index f9bec9d..5e6d93b 100644
--- a/frontend/angular-clarity-master/src/app/modules/main/datamanagement/datamanagement/datamanagement.component.ts
+++ b/frontend/angular-clarity-master/src/app/modules/main/datamanagement/datamanagement/datamanagement.component.ts
@@ -14,22 +14,22 @@ import { BulkimportService } from 'src/app/services/fnd/bulkimport.service';
styleUrls: ['./datamanagement.component.scss']
})
export class DatamanagementComponent implements OnInit {
- rowSelected :any= {};
- modaldelete=false;
- modalEdit=false;
- modalAdd= false;
+ rowSelected: any = {};
+ modaldelete = false;
+ modalEdit = false;
+ modalAdd = false;
public entryForm: FormGroup;
selected: any[] = [];
error;
loading = false;
data;
udata;
- selectedFile: File[]=[];
+ selectedFile: File[] = [];
entitydata;
// tableList =['priority','impact','urgency','category','state','contact_type','customer','handler'];
tableList;
- constructor( private excel: ExcelService, private datamservice:DatamanagementService, private toastr: ToastrService,
- private _fb: FormBuilder, private userservice:UsermaintanceService, private router: Router,private bulkimportService:BulkimportService,
+ constructor(private excel: ExcelService, private datamservice: DatamanagementService, private toastr: ToastrService,
+ private _fb: FormBuilder, private userservice: UsermaintanceService, private router: Router, private bulkimportService: BulkimportService,
private route: ActivatedRoute,) { }
ngOnInit(): void {
@@ -38,51 +38,51 @@ export class DatamanagementComponent implements OnInit {
this.allentity();
this.entitygetall();
this.entryForm = this._fb.group({
- user_id:[null],
- file_name:[null],
- entityName:[null],
- // entity_name:[null],
- file_type:[null],
+ user_id: [null],
+ file_name: [null],
+ entityName: [null],
+ // entity_name:[null],
+ file_type: [null],
- });
-// this.datamservice.getjson().subscribe((data)=>{
-// console.log(data);
-// })
+ });
+ // this.datamservice.getjson().subscribe((data)=>{
+ // console.log(data);
+ // })
}
- getall(){
- this.datamservice.getall().subscribe((data)=>{
- console.log(data);
- this.data=data;
- if(this.data.length == 0){
- this.error="No data Available";
+ getall() {
+ this.datamservice.getall().subscribe((data) => {
+ console.log('data managemnt ', data);
+ this.data = data;
+ if (this.data.length == 0) {
+ this.error = "No data Available";
console.log(this.error);
}
- },(error) => {
+ }, (error) => {
console.log(error);
- if(error){
- this.error="No data Available OR server Error";
- }
+ if (error) {
+ this.error = "No data Available OR server Error";
+ }
});
}
- entitygetall(){
- this.bulkimportService.getDetails().subscribe((data)=>{
+ entitygetall() {
+ this.bulkimportService.getDetails().subscribe((data) => {
console.log(data);
- this.tableList=data;
- },(error) => {
+ this.tableList = data;
+ }, (error) => {
console.log(error);
});
}
- getuserall(){
- this.userservice.getAll().subscribe((data)=>{
+ getuserall() {
+ this.userservice.getAll().subscribe((data) => {
console.log(data);
- this.udata=data;
+ this.udata = data;
})
}
- allentity(){
+ allentity() {
// this.datamservice.getallentity().subscribe((data)=>{
// console.log(data);
// this.entitydata=data;
@@ -101,77 +101,76 @@ export class DatamanagementComponent implements OnInit {
}
goToAdd() {
-this.modalAdd = true;
+ this.modalAdd = true;
}
- onSubmit(){
-console.log(this.entryForm.value);
-this.datamservice.create(this.selectedFile,this.entryForm.value.entityName).subscribe((data)=>{
- console.log(data);
- if(data.status===202){
- this.toastr.success("Added Succesfully");
- }
- setTimeout(() => {
- this.getall();
- }, 1000);
- this.getall();
-}, (error: HttpErrorResponse)=>{
- console.log(error);
- if(error.status >=200 && error.status <= 299){
- this.toastr.success("Added Succesfully");
- setTimeout(() => {
+ onSubmit() {
+ console.log(this.entryForm.value);
+ this.datamservice.create(this.selectedFile, this.entryForm.value.entityName).subscribe((data) => {
+ console.log(data);
+ if (data.status === 202) {
+ this.toastr.success("Added Succesfully");
+ }
+ setTimeout(() => {
+ this.getall();
+ }, 1000);
this.getall();
- }, 1000);
- }
- if(error.status===404){
- this.toastr.error("Not Added");
- }
- this.ngOnInit();
-});
-this.modalAdd=false;
+ }, (error: HttpErrorResponse) => {
+ console.log(error);
+ if (error.status >= 200 && error.status <= 299) {
+ this.toastr.success("Added Succesfully");
+ setTimeout(() => {
+ this.getall();
+ }, 1000);
+ }
+ if (error.status === 404) {
+ this.toastr.error("Not Added");
+ }
+ this.ngOnInit();
+ });
+ this.modalAdd = false;
}
onEdit(row) {
this.rowSelected = row;
this.modalEdit = true;
}
- onDelete(row) {
+ onDelete(row) {
this.rowSelected = row;
- this.modaldelete=true;
+ this.modaldelete = true;
}
- delete(id)
- {
+ delete(id) {
this.modaldelete = false;
- console.log("in delete "+id);
+ console.log("in delete " + id);
this.datamservice.delete(id).subscribe(
(data) => {
console.log(data);
this.ngOnInit();
- if(data.status >=200 && data.status <= 299 || data == null) {
+ if (data.status >= 200 && data.status <= 299 || data == null) {
this.toastr.success("Delete Succesfully");
}
- }, (error: HttpHeaderResponse)=>{
+ }, (error: HttpHeaderResponse) => {
console.log(error);
- if(error.status >=200 && error.status <= 299){
+ if (error.status >= 200 && error.status <= 299) {
this.toastr.success("Delete Succesfully");
}
- if(error.status >=400 && error.status <= 499){
+ if (error.status >= 400 && error.status <= 499) {
this.toastr.error("Not Delete");
}
- if(error.status >=500 && error.status <= 599){
+ if (error.status >= 500 && error.status <= 599) {
this.toastr.error("Server Error");
}
});
- this.ngOnInit();
+ this.ngOnInit();
}
onUpdate(id) {
this.modalEdit = false;
- this.datamservice.update(id,this.rowSelected,this.selectedFile).subscribe(
+ this.datamservice.update(id, this.rowSelected, this.selectedFile).subscribe(
(data) => {
console.log(data);
- if(data.status===202){
+ if (data.status === 202) {
this.toastr.success("Updated Succesfully");
}
@@ -181,9 +180,9 @@ this.modalAdd=false;
}
);
this.ngOnInit();
-}
-work(id:any){
- console.log(id);
- this.router.navigate(["../dataworkflow/"+ id], { relativeTo: this.route });
-}
+ }
+ work(id: any) {
+ console.log(id);
+ this.router.navigate(["../dataworkflow/" + id], { relativeTo: this.route });
+ }
}
diff --git a/frontend/angular-clarity-master/src/app/modules/main/datamanagement/datamananementworkflow/datamananementworkflow.component.html b/frontend/angular-clarity-master/src/app/modules/main/datamanagement/datamananementworkflow/datamananementworkflow.component.html
index 2c7ad2e..1268fb9 100644
--- a/frontend/angular-clarity-master/src/app/modules/main/datamanagement/datamananementworkflow/datamananementworkflow.component.html
+++ b/frontend/angular-clarity-master/src/app/modules/main/datamanagement/datamananementworkflow/datamananementworkflow.component.html
@@ -1,4 +1,3 @@
-
- Admin
- Data Import
@@ -13,63 +12,65 @@
Reset
- HorizonTal Layout
- Vertical Layout
+ HorizonTal Layout
+ Vertical
+ Layout
-
-
+
+
-
-
+
@@ -78,12 +79,12 @@
Update {{college.studentname}}
-
+
-
-
-
-
+
+
+
+
-
-
-
-