diff --git a/prod124njac-back-b/authsec_node/Backend/app.js b/prod124njac-back-b/authsec_node/Backend/app.js index b88b46b..5378bb9 100644 --- a/prod124njac-back-b/authsec_node/Backend/app.js +++ b/prod124njac-back-b/authsec_node/Backend/app.js @@ -35,6 +35,8 @@ app.use(`${basePath}`, userRouter) app.use(bodyParser.json()) // buildercomponents + + const FormaRouter = require("./routes/basicp1/Forma.routes") app.use("/Forma/Forma", FormaRouter) diff --git a/prod124njac-back-b/authsec_node/Backend/entity/basicp1/Forma.controller.js b/prod124njac-back-b/authsec_node/Backend/entity/basicp1/Forma.controller.js index b1e6110..c45905b 100644 --- a/prod124njac-back-b/authsec_node/Backend/entity/basicp1/Forma.controller.js +++ b/prod124njac-back-b/authsec_node/Backend/entity/basicp1/Forma.controller.js @@ -65,11 +65,9 @@ const getUsersByUserId = async (req, res) => { const createUser = async (req, res) => { const body = req.body try { - const params = [ body.namem, + const params = [ body.percentages, -body.filetest, - -body.imagtest, +body.recaptchat, ] @@ -81,11 +79,9 @@ body.imagtest, await executeQuery( ` INSERT INTO forma - SET namem = ?, + SET percentages = ?, -filetest = ?, - -imagtest = ? +recaptchat = ? `, sanitizedParams @@ -110,11 +106,9 @@ const updateUsers = async (req, res) => { try { // Ensure that required parameters exist and replace undefined with null - const params = [body.namem, + const params = [body.percentages, -body.filetest, - -body.imagtest, +body.recaptchat, id, ]; @@ -124,11 +118,9 @@ body.imagtest, const results = await executeQuery( ` UPDATE forma - SET namem = ?, + SET percentages = ?, -filetest = ?, - -imagtest = ? +recaptchat = ? WHERE id = ? `, diff --git a/prod124njac-db-d/authsec_mysql/mysql/wf_table/wf_table.sql b/prod124njac-db-d/authsec_mysql/mysql/wf_table/wf_table.sql index 9ef8ce3..57290bc 100755 --- a/prod124njac-db-d/authsec_mysql/mysql/wf_table/wf_table.sql +++ b/prod124njac-db-d/authsec_mysql/mysql/wf_table/wf_table.sql @@ -1,2 +1,2 @@ -CREATE TABLE db.Forma(id BIGINT NOT NULL AUTO_INCREMENT, Imagtest VARCHAR(400), Namem VARCHAR(400), Filetest VARCHAR(400), PRIMARY KEY (id)); +CREATE TABLE db.Forma(id BIGINT NOT NULL AUTO_INCREMENT, Percentages VARCHAR(400), recaptchat VARCHAR(400), PRIMARY KEY (id)); diff --git a/prod124njac-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Forma/Forma.component.html b/prod124njac-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Forma/Forma.component.html index 9f30aba..2f07d25 100644 --- a/prod124njac-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Forma/Forma.component.html +++ b/prod124njac-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Forma/Forma.component.html @@ -23,12 +23,12 @@
{{error}}
- Namem + Percentages - - + recaptchat + @@ -39,11 +39,10 @@ -{{user. namem }} - - +{{user. percentages }} +{{user. recaptchat }} @@ -201,16 +200,12 @@ - -

Update Forma - -

{{rowSelected.id}}

@@ -218,100 +213,23 @@
- - + +
- - - +
+
{{ recaptchatCode }}  
+ +
+
recaptchat not valid.
+
+
-
List of filetest
-
- - - - - - - - - - - - - - - - - - - - - - - -
No FileFile NamePreviewCancel
- {{attach.uploadedfile_name}} File Preview - - - - -
Are you sure?
-   - - - - -
- -
List of imagtest
- -
- - - - - - - - - - - - - - - - - - - - - - - -
No FileFile NamePreviewCancel
- {{attach.uploadedfile_name}} File Preview - - - - -
Are you sure?
-   - - - - -
-
List of filetest
-
- - - - - - - - - - - - - - - - - - - - - - - -
No FileFile NamePreviewCancel
- {{attach.uploadedfile_name}} File Preview - - - -
- -
List of imagtest
- -
- - - - - - - - - - - - - - - - - - - - - - - -
No FileFile NamePreviewCancel
- {{attach.uploadedfile_name}} File Preview - - - -
@@ -495,6 +351,4 @@ - - diff --git a/prod124njac-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Forma/Forma.component.ts b/prod124njac-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Forma/Forma.component.ts index 810aa6a..a2ca19b 100644 --- a/prod124njac-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Forma/Forma.component.ts +++ b/prod124njac-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Forma/Forma.component.ts @@ -63,19 +63,15 @@ private userInfoService:UserInfoService, this.userrole=this.userInfoService.getRoles(); this.getData(); this.entryForm = this._fb.group({ -namem : [null], - - - +percentages : [null,[Validators.required]], +recaptchat : [null, [Validators.required,this.checkrecaptchat.bind(this)]], - - }); // component_button200 // form code start this.extensionService.getJsonObjectsByFormCodeList(this.formcode).subscribe(data => { @@ -100,9 +96,7 @@ namem : [null], // form code end - - - +this.generaterecaptchat() } @@ -110,9 +104,6 @@ namem : [null], -FileDataImagtest: any[]; - selectedImagtest: any[]; - error; getData() { this.mainService.getAll().subscribe((data) => { @@ -132,19 +123,7 @@ FileDataImagtest: any[]; this.rowSelected = row; - this.selectedfiletest = []; - this.mainService.uploadfilegetByIdfiletest(row.id,this.tableName).subscribe(uploaddata =>{ - console.log(uploaddata); - this.FileDatafiletest = uploaddata; - - }) - this.selectedimagtest = []; - this.mainService.uploadImagtestgetById(row.id,this.tableName).subscribe(uploaddata =>{ - console.log(uploaddata); - this.FileDataimagtest = uploaddata; - - }) this.modalEdit = true; @@ -170,8 +149,6 @@ FileDataImagtest: any[]; - - //console.log("in update"); console.log("id " + id); console.log(this.rowSelected); @@ -185,19 +162,7 @@ FileDataImagtest: any[]; -for (let i = 0; i < this.selectedfiletest.length; i++){ - this.mainService.uploadfilefiletest(data.id,this.tableName,this.selectedfiletest[i]).subscribe(uploaddata =>{ - console.log(uploaddata); - }) -} - -for (let i = 0; i < this.selectedimagtest.length; i++){ - - this.mainService.uploadImagtest(data.id,this.tableName,this.selectedimagtest[i]).subscribe(uploaddata =>{ - console.log(uploaddata); - }) -} }, (error) => { console.log(error); @@ -221,8 +186,6 @@ onCreate() { - - this.mainService.create(this.entryForm.value).subscribe( (data) => { console.log(data); @@ -231,19 +194,7 @@ onCreate() { } -for (let i = 0; i < this.selectedfiletest.length; i++){ - this.mainService.uploadfilefiletest(data.id,this.tableName,this.selectedfiletest[i]).subscribe(uploaddata =>{ - console.log(uploaddata); - }) -} - -for (let i = 0; i < this.selectedimagtest.length; i++){ - - this.mainService.uploadImagtest(data.id,this.tableName,this.selectedimagtest[i]).subscribe(uploaddata =>{ - console.log(uploaddata); - }) -} }, (error) => { @@ -265,11 +216,7 @@ for (let i = 0; i < this.selectedimagtest.length; i++){ goToAdd(row) { this.modalAdd = true; this.submitted = false; -this.FileDatafiletest = []; -this.selectedfiletest =[]; -this.FileDataImagtest = []; -this.selectedImagtest =[]; } @@ -284,90 +231,34 @@ onSubmit() { } -filePreviewfiletest: string | ArrayBuffer | null = null; -FileDatafiletest: {uploadedfile_name?:any, filePreview: string | ArrayBuffer | null }[] = []; // Initialize the array -selectedfiletest: File[]=[]; -public onFileChangedfiletest(event, index) { - const files = event.target.files; - for (let i = 0; i < files.length; i++) { - const file = files[i]; - this.FileDatafiletest[index].uploadedfile_name = files[i].name; - this.selectedfiletest.push(files[i]); - if (file.type.startsWith('file/')) { - const reader = new FileReader(); - reader.onload = (e) => { - // Set the file preview source - const filePreview = e.target?.result as string; - this.FileDatafiletest[index] = { - ...this.FileDatafiletest[index], // Preserve existing properties - filePreview: filePreview // Update only the filePreview property - }; - }; - reader.readAsDataURL(file); - } +recaptchatCode = ''; +generaterecaptchat (): void { + const possibleCharacters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789'; + const codeLength = 6; // Change to desired length + + let recaptchat= ''; + for (let i = 0; i < codeLength; i++) { + const randomIndex = Math.floor(Math.random() * possibleCharacters.length); + recaptchat += possibleCharacters.charAt(randomIndex); } + this.recaptchatCode = recaptchat; } - onAddLinesfiletest(){ - this.FileDatafiletest.push({ - uploadedfile_name: "", - filePreview: "", - // f3: "", - }); - } - deleteRowfiletest(index,id) { - this.FileDatafiletest.splice(index, 1); - if(id){ - this.mainService.uploadfiledeletefiletest(id).subscribe(data =>{ - console.log(data); - }) - } - } - -filePreviewimagtest: string | ArrayBuffer | null = null; -FileDataimagtest: {uploadedfile_name?:any, filePreview: string | ArrayBuffer | null }[] = []; // Initialize the array -selectedimagtest: File[]=[]; -public onFileChangedimagtest(event, index) { - const files = event.target.files; - for (let i = 0; i < files.length; i++) { - const file = files[i]; - this.FileDataimagtest[index].uploadedfile_name = files[i].name; - this.selectedimagtest.push(files[i]); - if (file.type.startsWith('image/')) { - const reader = new FileReader(); - reader.onload = (e) => { - // Set the file preview source - const filePreview = e.target?.result as string; - this.FileDataimagtest[index] = { - ...this.FileDataimagtest[index], // Preserve existing properties - filePreview: filePreview // Update only the filePreview property - }; - }; - reader.readAsDataURL(file); - } +checkrecaptchat(control: AbstractControl): ValidationErrors | null { + if (control.value !== this.recaptchatCode) { + return { recaptchatMismatch: true }; } -} - onAddLinesimagtest(){ - this.FileDataimagtest.push({ - uploadedfile_name: "", - filePreview: "", - // f3: "", - }); - } - deleteRowimagtest(index,id) { - this.FileDataimagtest.splice(index, 1); + return null; +} - if(id){ - this.mainService.uploadImagtestdelete(id).subscribe(data =>{ - console.log(data); - }) - } - } +recaptchatMismatch = false; + +checkrecaptchatEdit(): void { + if (this.rowSelected.recaptchat !== this. recaptchatCode) { + this. recaptchatMismatch = true; } else { this.recaptchatMismatch = false; } } // updateaction } - - diff --git a/prod124njac-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Forma/Forma.service.ts b/prod124njac-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Forma/Forma.service.ts index c82d3d3..da02b28 100644 --- a/prod124njac-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Forma/Forma.service.ts +++ b/prod124njac-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Forma/Forma.service.ts @@ -31,35 +31,7 @@ export class Formaservice{ } - uploadfilefiletest(ref:any, Forma:any, file:any): Observable{ - const formData = new FormData(); - formData.append('file', file); - return this.apiRequest.postFormData(`FileUpload/Uploadeddocs/${ref}/${Forma}`, formData); - } - uploadfilegetByIdfiletest(ref:any, Forma:any,): Observable { - return this.apiRequest.get(`FileUpload/Uploadeddocs/${ref}/${Forma}`); - } - - - uploadfiledeletefiletest(id: number): Observable { - return this.apiRequest.delete(`FileUpload/Uploadeddocs/${id}`); - } - - uploadImagtest(ref:any, Forma:any, file:any): Observable{ - const formData = new FormData(); - formData.append('file', file); - return this.apiRequest.postFormData(`FileUpload/Uploadeddocs/${ref}/${Forma}`, formData); - } - - uploadImagtestgetById(ref:any, Forma:any,): Observable { - return this.apiRequest.get(`FileUpload/Uploadeddocs/${ref}/${Forma}`); - } - - - uploadImagtestdelete(id: number): Observable { - return this.apiRequest.delete(`FileUpload/Uploadeddocs/${id}`); - } // updateaction } \ No newline at end of file diff --git a/prod124njac-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main-routing.module.ts b/prod124njac-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main-routing.module.ts index ec2cdd5..c7ae7e6 100644 --- a/prod124njac-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main-routing.module.ts +++ b/prod124njac-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main-routing.module.ts @@ -1,3 +1,4 @@ + import { FormaComponent } from './BuilderComponents/basicp1/Forma/Forma.component'; @@ -241,6 +242,8 @@ children: [ // buildercomponents + + {path:'Forma',component:FormaComponent}, diff --git a/prod124njac-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main.module.ts b/prod124njac-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main.module.ts index 79936a3..a314395 100644 --- a/prod124njac-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main.module.ts +++ b/prod124njac-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main.module.ts @@ -1,3 +1,4 @@ + import { FormaComponent } from './BuilderComponents/basicp1/Forma/Forma.component'; @@ -143,6 +144,8 @@ import { MappingruleeditComponent } from './datamanagement/mappingrule/mappingru // buildercomponents + + FormaComponent,