build_app

This commit is contained in:
risadmin_prod 2025-06-18 09:58:59 +00:00
parent 994766868e
commit 473fd5676d
17 changed files with 22 additions and 123 deletions

View File

@ -72,6 +72,12 @@ public class BuilderService {
addCustomMenu( "Steps","Stepper_workflow", "Transcations"); addCustomMenu( "Steps","Stepper_workflow", "Transcations");
addCustomMenu( "Forma","Forma", "Transcations");
addCustomMenu( "Steps","Stepper_workflow", "Transcations");
addCustomMenu( "Forma","Forma", "Transcations"); addCustomMenu( "Forma","Forma", "Transcations");

View File

@ -20,8 +20,6 @@ import com.realnet.basicp1.Services.FormaService ;
@RequestMapping(value = "/Forma") @RequestMapping(value = "/Forma")
@CrossOrigin("*") @CrossOrigin("*")
@RestController @RestController
@ -36,16 +34,12 @@ public class FormaController {
@PostMapping("/Forma") @PostMapping("/Forma")
public Forma Savedata(@RequestBody Forma data) { public Forma Savedata(@RequestBody Forma data) {
Forma save = Service.Savedata(data) ; Forma save = Service.Savedata(data) ;
System.out.println("data saved..." + save); System.out.println("data saved..." + save);
return save; return save;
@ -94,6 +88,4 @@ public class FormaController {
} }

View File

@ -20,8 +20,6 @@ import com.realnet.basicp1.Services.FormaService ;
@RequestMapping(value = "/token/Forma") @RequestMapping(value = "/token/Forma")
@CrossOrigin("*") @CrossOrigin("*")
@RestController @RestController
@ -36,16 +34,12 @@ public class tokenFree_FormaController {
@PostMapping("/Forma") @PostMapping("/Forma")
public Forma Savedata(@RequestBody Forma data) { public Forma Savedata(@RequestBody Forma data) {
Forma save = Service.Savedata(data) ; Forma save = Service.Savedata(data) ;
System.out.println("data saved..." + save); System.out.println("data saved..." + save);
return save; return save;
@ -94,6 +88,4 @@ public class tokenFree_FormaController {
} }

View File

@ -8,8 +8,6 @@ import com.realnet.WhoColumn.Entity.Extension;
@Entity @Entity
@Data @Data
public class Forma extends Extension { public class Forma extends Extension {
@ -27,7 +25,5 @@ private String name;
private String fileupload_fieldname; private String fileupload_fieldname;
private String fileupload_fieldpath ; private String fileupload_fieldpath ;
private String qrcode_field;
} }

View File

@ -15,8 +15,6 @@ import java.util.*;
import com.realnet.basicp1.Entity.Forma; import com.realnet.basicp1.Entity.Forma;
@Repository @Repository

View File

@ -16,8 +16,6 @@ import com.realnet.users.entity1.AppUser;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@Service @Service
@ -31,15 +29,11 @@ private FormaRepository Repository;
public Forma Savedata(Forma data) { public Forma Savedata(Forma data) {
data.setUpdatedBy(getUser().getUserId()); data.setUpdatedBy(getUser().getUserId());
data.setCreatedBy(getUser().getUserId()); data.setCreatedBy(getUser().getUserId());
data.setAccountId(getUser().getAccount().getAccount_id()); data.setAccountId(getUser().getAccount().getAccount_id());
@ -75,8 +69,6 @@ old.setName(data.getName());
old.setQrcode_field(data.getQrcode_field());
final Forma test = Repository.save(old); final Forma test = Repository.save(old);
data.setUpdatedBy(getUser().getUserId()); data.setUpdatedBy(getUser().getUserId());
return test;} return test;}
@ -84,8 +76,6 @@ final Forma test = Repository.save(old);
public AppUser getUser() { public AppUser getUser() {
AppUser user = userService.getLoggedInUser(); AppUser user = userService.getLoggedInUser();
return user; return user;

View File

@ -1,2 +1,2 @@
CREATE TABLE db.Forma(id BIGINT NOT NULL AUTO_INCREMENT, qrcode_field VARCHAR(400), fileupload_field VARCHAR(400), name VARCHAR(400), PRIMARY KEY (id)); CREATE TABLE db.Forma(id BIGINT NOT NULL AUTO_INCREMENT, fileupload_field VARCHAR(400), name VARCHAR(400), PRIMARY KEY (id));

View File

@ -29,10 +29,6 @@
<clr-dg-column [clrDgField]="'qrcode_field'"> <ng-container *clrDgHideableColumn="{hidden: false}"> QRCode Field
</ng-container></clr-dg-column>
<!-- who column --> <!-- who column -->
<clr-dg-column> <ng-container *clrDgHideableColumn="{hidden: false}"> <clr-dg-column> <ng-container *clrDgHideableColumn="{hidden: false}">
<clr-icon shape="bars"></clr-icon> Action <clr-icon shape="bars"></clr-icon> Action
@ -46,9 +42,6 @@
<clr-dg-cell>{{user.qrcode_field }}</clr-dg-cell>
<!-- who column --> <!-- who column -->
<clr-dg-cell> <clr-dg-cell>
<clr-signpost> <clr-signpost>
@ -204,8 +197,6 @@
<!-- // EDIT DATA......... --> <!-- // EDIT DATA......... -->
<clr-modal [(clrModalOpen)]="modalEdit" [clrModalSize]="'lg'" [clrModalStaticBackdrop]="true"> <clr-modal [(clrModalOpen)]="modalEdit" [clrModalSize]="'lg'" [clrModalStaticBackdrop]="true">
<h3 class="modal-title">Update Forma <h3 class="modal-title">Update Forma
@ -213,8 +204,6 @@
</h3> </h3>
<div class="modal-body" *ngIf="rowSelected.id"> <div class="modal-body" *ngIf="rowSelected.id">
<h2 class="heading">{{rowSelected.id}}</h2> <h2 class="heading">{{rowSelected.id}}</h2>
@ -228,14 +217,6 @@
<!-- qrCode field start -->
<div class="clr-col-sm-12">
<label> QRCode Field</label>
<input class="clr-input" type="text" name="qrcode_field" [(ngModel)]="rowSelected.qrcode_field" />
<qrcode [qrdata]="rowSelected.qrcode_field ? rowSelected.qrcode_field : '' " [width]="135" [errorCorrectionLevel]="'M'"></qrcode>
</div>
<!-- qrCode field end -->
</div> </div>
@ -281,8 +262,6 @@
</table> </div> </table> </div>
<!-- form code start --> <!-- form code start -->
<div *ngIf="checkFormCode"> <div *ngIf="checkFormCode">
<h4 style="font-weight: 300;display: inline;">Extension</h4> <h4 style="font-weight: 300;display: inline;">Extension</h4>
@ -331,8 +310,6 @@
<!-- aeroplane icon --> <!-- aeroplane icon -->
&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;
<a *ngIf="userrole?.includes('ADMIN')" style="float: right;" href="javascript:void(0)" role="tooltip" aria-haspopup="true" <a *ngIf="userrole?.includes('ADMIN')" style="float: right;" href="javascript:void(0)" role="tooltip" aria-haspopup="true"
@ -353,13 +330,6 @@
<!-- qrCode field start -->
<div class="clr-col-sm-12">
<label>QRCode Field</label>
<input class="clr-input" type="text" formControlName="qrcode_field" />
<qrcode [qrdata]="entryForm.value.qrcode_field ? entryForm.value.qrcode_field : '' " [width]="135" [errorCorrectionLevel]="'M'" ></qrcode> </div>
<!-- qrCode field end -->
</div> </div>
@ -401,8 +371,6 @@
<!-- form code start --> <!-- form code start -->
<div *ngIf="checkFormCode"> <div *ngIf="checkFormCode">
<h4 style="font-weight: 300;display: inline;">Extension</h4> <h4 style="font-weight: 300;display: inline;">Extension</h4>
@ -437,6 +405,4 @@
<!-- htmlpopup --> <!-- htmlpopup -->

View File

@ -67,10 +67,6 @@ name : [null],
qrcode_field : [null],
@ -103,15 +99,11 @@ qrcode_field : [null],
} }
error; error;
getData() { getData() {
this.mainService.getAll().subscribe((data) => { this.mainService.getAll().subscribe((data) => {
@ -139,8 +131,6 @@ qrcode_field : [null],
}) })
this.modalEdit = true; this.modalEdit = true;
} }
onDelete(row) { onDelete(row) {
@ -164,8 +154,6 @@ qrcode_field : [null],
//console.log("in update"); //console.log("in update");
console.log("id " + id); console.log("id " + id);
console.log(this.rowSelected); console.log(this.rowSelected);
@ -188,8 +176,6 @@ for (let i = 0; i < this.selectedfileupload_field.length; i++){
}) })
} }
}, (error) => { }, (error) => {
console.log(error); console.log(error);
if (error.status >= 200 && error.status <= 299) { if (error.status >= 200 && error.status <= 299) {
@ -212,8 +198,6 @@ onCreate() {
this.mainService.create(this.entryForm.value).subscribe( this.mainService.create(this.entryForm.value).subscribe(
(data) => { (data) => {
console.log(data); console.log(data);
@ -232,8 +216,6 @@ for (let i = 0; i < this.selectedfileupload_field.length; i++){
} }
}, (error) => { }, (error) => {
console.log(error); console.log(error);
if (error.status >= 200 && error.status <= 299) { if (error.status >= 200 && error.status <= 299) {
@ -257,8 +239,6 @@ this.FileDatafileupload_field = [];
this.selectedfileupload_field =[]; this.selectedfileupload_field =[];
} }
submitted = false; submitted = false;
onSubmit() { onSubmit() {
@ -311,12 +291,8 @@ public onFileChangedfileupload_field(event, index) {
} }
} }
// updateaction // updateaction
} }

View File

@ -46,7 +46,5 @@ export class Formaservice{
return this.apiRequest.delete(`FileUpload/Uploadeddocs/${id}`); return this.apiRequest.delete(`FileUpload/Uploadeddocs/${id}`);
} }
// updateaction // updateaction
} }

View File

@ -20,6 +20,7 @@
import { Component, OnInit } from '@angular/core'; import { Component, OnInit } from '@angular/core';
@ -250,6 +251,8 @@ export class Stepper_workflowComponent implements OnInit {
console.log('id is ', id) console.log('id is ', id)
// stepper route // stepper route
this.router.navigate(["../steps/", id], { relativeTo: this.route }); this.router.navigate(["../steps/", id], { relativeTo: this.route });

View File

@ -65,13 +65,6 @@
<!-- qrCode field start -->
<div class="clr-col-sm-12">
<label>QRCode Field</label>
<input class="clr-input" type="text" formControlName="qrcode_field" />
<qrcode [qrdata]="FormaentryForm.value.qrcode_field ? FormaentryForm.value.qrcode_field : '' " [width]="135" [errorCorrectionLevel]="'M'" ></qrcode> </div>
<!-- qrCode field end -->
</div> </div>
@ -112,8 +105,6 @@
</table> </div> </table> </div>
<div class="clr-row"> <div class="clr-row">
</div> </div>
@ -146,8 +137,6 @@
<p><strong>Fileupload Field : </strong> {{ FormaentryForm.get('fileupload_field')?.value }}</p> <p><strong>Fileupload Field : </strong> {{ FormaentryForm.get('fileupload_field')?.value }}</p>
<p><strong>QRCode Field : </strong> {{ FormaentryForm.get('qrcode_field')?.value }}</p>
</div> </div>
</div><div class="button"> </div><div class="button">

View File

@ -73,16 +73,12 @@ name : [null],
qrcode_field : [null],
}); });
const stepId = this.id; // or from route/query/etc const stepId = this.id; // or from route/query/etc
this.getResolvedDataFromStepper(stepId).subscribe(res => { this.getResolvedDataFromStepper(stepId).subscribe(res => {
@ -113,8 +109,6 @@ name: data.name || '',
fileupload_field: data.fileupload_field || '', fileupload_field: data.fileupload_field || '',
qrcode_field: data.qrcode_field || '',
}); });
} }
getResolvedDataFromStepper(id: number): Observable<any> { getResolvedDataFromStepper(id: number): Observable<any> {
@ -217,8 +211,6 @@ qrcode_field: data.qrcode_field || '',
this.mainService.createForma(this.FormaentryForm.value).subscribe( this.mainService.createForma(this.FormaentryForm.value).subscribe(
(data) => { (data) => {
console.log('adding data ', data); console.log('adding data ', data);
@ -250,8 +242,6 @@ for (let i = 0; i < this.selectedfileupload_field.length; i++){
} }
}, (error) => { }, (error) => {
console.log(error); console.log(error);
if (error.status >= 200 && error.status <= 299) { if (error.status >= 200 && error.status <= 299) {
@ -345,14 +335,8 @@ public onFileChangedfileupload_field(event, index) {
// updateaction // updateaction
} }

View File

@ -59,7 +59,5 @@ gettabledata(id: number): Observable<any> {
return this.apiRequest.delete(`FileUpload/Uploadeddocs/${id}`); return this.apiRequest.delete(`FileUpload/Uploadeddocs/${id}`);
} }
// updateaction // updateaction
} }

View File

@ -1,3 +1,5 @@
import { stepsComponent } from './BuilderComponents/stepperworkflow/steps/steps.component'; import { stepsComponent } from './BuilderComponents/stepperworkflow/steps/steps.component';
import { FormaComponent } from './BuilderComponents/basicp1/Forma/Forma.component'; import { FormaComponent } from './BuilderComponents/basicp1/Forma/Forma.component';
@ -258,6 +260,10 @@ const routes: Routes = [
// buildercomponents // buildercomponents
{path:'steps/:id',component:stepsComponent}, {path:'steps/:id',component:stepsComponent},

View File

@ -1,3 +1,5 @@
import { stepsComponent } from './BuilderComponents/stepperworkflow/steps/steps.component'; import { stepsComponent } from './BuilderComponents/stepperworkflow/steps/steps.component';
import { FormaComponent } from './BuilderComponents/basicp1/Forma/Forma.component'; import { FormaComponent } from './BuilderComponents/basicp1/Forma/Forma.component';
@ -131,6 +133,10 @@ import { Stepper_workflowComponent } from './BuilderComponents/stepperworkflow/S
// buildercomponents // buildercomponents
stepsComponent, stepsComponent,

View File

@ -227,7 +227,6 @@
"STATUS": "Status", "STATUS": "Status",
"SUB_MENU": "Sub Menu", "SUB_MENU": "Sub Menu",
"Forma": "Forma", "Forma": "Forma",
"QRCode_Field": "QRCode_Field",
"Fileupload_Field": "Fileupload_Field", "Fileupload_Field": "Fileupload_Field",
"Name": "Name" "Name": "Name"
} }