build_app

This commit is contained in:
risadmin_prod 2025-07-18 08:47:22 +00:00
parent 0771dc07dc
commit efb0993886
13 changed files with 137 additions and 1 deletions

View File

@ -81,6 +81,21 @@ addCustomMenu( "Notes","Notes", "Transcations");
addCustomMenu( "Tasks","Tasks", "Transcations"); addCustomMenu( "Tasks","Tasks", "Transcations");
addCustomMenu( "Journal","Journal", "Transcations");
addCustomMenu( "Categories","Categories", "Master");
addCustomMenu( "Expenses","Expenses", "Transcations");
addCustomMenu( "Notes","Notes", "Transcations");
addCustomMenu( "Tasks","Tasks", "Transcations");
addCustomMenu( "Journal","Journal", "Transcations"); addCustomMenu( "Journal","Journal", "Transcations");

View File

@ -22,6 +22,8 @@ import com.realnet.basic.Services.ExpensesService ;
@RequestMapping(value = "/Expenses") @RequestMapping(value = "/Expenses")
@CrossOrigin("*") @CrossOrigin("*")
@RestController @RestController
@ -38,6 +40,8 @@ public class ExpensesController {
@PostMapping("/Expenses") @PostMapping("/Expenses")
public Expenses Savedata(@RequestBody Expenses data) { public Expenses Savedata(@RequestBody Expenses data) {
Expenses save = Service.Savedata(data) ; Expenses save = Service.Savedata(data) ;
@ -46,6 +50,8 @@ public class ExpensesController {
System.out.println("data saved..." + save); System.out.println("data saved..." + save);
return save; return save;
@ -96,4 +102,6 @@ public class ExpensesController {
} }

View File

@ -22,6 +22,8 @@ import com.realnet.basic.Services.ExpensesService ;
@RequestMapping(value = "/token/Expenses") @RequestMapping(value = "/token/Expenses")
@CrossOrigin("*") @CrossOrigin("*")
@RestController @RestController
@ -38,6 +40,8 @@ public class tokenFree_ExpensesController {
@PostMapping("/Expenses") @PostMapping("/Expenses")
public Expenses Savedata(@RequestBody Expenses data) { public Expenses Savedata(@RequestBody Expenses data) {
Expenses save = Service.Savedata(data) ; Expenses save = Service.Savedata(data) ;
@ -46,6 +50,8 @@ public class tokenFree_ExpensesController {
System.out.println("data saved..." + save); System.out.println("data saved..." + save);
return save; return save;
@ -96,4 +102,6 @@ public class tokenFree_ExpensesController {
} }

View File

@ -10,6 +10,8 @@ import com.realnet.WhoColumn.Entity.Extension;
@Entity @Entity
@Data @Data
public class Expenses extends Extension { public class Expenses extends Extension {
@ -30,5 +32,7 @@ private int amount;
private String select_category; private String select_category;
private String select_categoryname; private String select_categoryname;
private int total_expenses;
} }

View File

@ -21,6 +21,8 @@ import com.realnet.basic.Services.CategoriesService;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@Service @Service
@ -37,6 +39,8 @@ private ExpensesRepository Repository;
@Autowired @Autowired
private CategoriesService select_categoryserv; private CategoriesService select_categoryserv;
public Expenses Savedata(Expenses data) { public Expenses Savedata(Expenses data) {
@ -62,6 +66,8 @@ Categories get = select_categoryserv.getdetailsbyId(select_categoryId);
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());
@ -99,6 +105,8 @@ old.setAmount(data.getAmount());
old.setSelect_category(data.getSelect_category()); old.setSelect_category(data.getSelect_category());
old.setTotal_expenses(data.getTotal_expenses());
final Expenses test = Repository.save(old); final Expenses test = Repository.save(old);
data.setUpdatedBy(getUser().getUserId()); data.setUpdatedBy(getUser().getUserId());
return test;} return test;}
@ -108,6 +116,8 @@ final Expenses test = Repository.save(old);
public AppUser getUser() { public AppUser getUser() {
AppUser user = userService.getLoggedInUser(); AppUser user = userService.getLoggedInUser();
return user; return user;

View File

@ -4,7 +4,7 @@ CREATE TABLE dbf.Tasks(id BIGINT NOT NULL AUTO_INCREMENT, task VARCHAR(400), sta
CREATE TABLE dbf.Notes(id BIGINT NOT NULL AUTO_INCREMENT, description VARCHAR(400), note_title VARCHAR(400), PRIMARY KEY (id)); CREATE TABLE dbf.Notes(id BIGINT NOT NULL AUTO_INCREMENT, description VARCHAR(400), note_title VARCHAR(400), PRIMARY KEY (id));
CREATE TABLE dbf.Expenses(id BIGINT NOT NULL AUTO_INCREMENT, description VARCHAR(400), amount int, select_category int, PRIMARY KEY (id)); CREATE TABLE dbf.Expenses(id BIGINT NOT NULL AUTO_INCREMENT, description VARCHAR(400), amount int, select_category int, total_expenses int, PRIMARY KEY (id));
CREATE TABLE dbf.Categories(id BIGINT NOT NULL AUTO_INCREMENT, name VARCHAR(400), PRIMARY KEY (id)); CREATE TABLE dbf.Categories(id BIGINT NOT NULL AUTO_INCREMENT, name VARCHAR(400), PRIMARY KEY (id));

View File

@ -34,6 +34,10 @@
<clr-dg-column [clrDgField]="'select_category'"> <ng-container *clrDgHideableColumn="{hidden: false}"> select Category <clr-dg-column [clrDgField]="'select_category'"> <ng-container *clrDgHideableColumn="{hidden: false}"> select Category
</ng-container></clr-dg-column> </ng-container></clr-dg-column>
<clr-dg-column [clrDgField]="'total_expenses'"> <ng-container *clrDgHideableColumn="{hidden: false}"> Total Expenses
</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}">
@ -52,6 +56,9 @@
<clr-dg-cell>{{user. select_categoryname }}</clr-dg-cell> <clr-dg-cell>{{user. select_categoryname }}</clr-dg-cell>
<clr-dg-cell>{{user.total_expenses }}</clr-dg-cell>
<!-- who column --> <!-- who column -->
<clr-dg-cell> <clr-dg-cell>
@ -214,6 +221,8 @@
<!-- // 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 Expenses <h3 class="modal-title">Update Expenses
@ -223,6 +232,8 @@
</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>
@ -249,6 +260,11 @@
<div class="clr-col-sm-12">
<label>Total Expenses</label>
<input id="name" class="clr-input" type="number" [(ngModel)]="rowSelected.total_expenses" name="total_expenses" />
</div>
</div> </div>
@ -256,6 +272,8 @@
<!-- 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>
@ -306,6 +324,8 @@
<!-- 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"
@ -343,6 +363,14 @@
<div class="clr-col-sm-12">
<label> Total Expenses</label>
<input class="clr-input" type="number" formControlName="total_expenses" />
<div *ngIf="submitted && entryForm.controls.total_expenses.errors" class="error_mess">
<div *ngIf="submitted && entryForm.controls.total_expenses.errors.required" class="error_mess">*This field is Required</div>
</div>
</div>
</div> </div>
@ -351,6 +379,8 @@
<!-- form code start --> <!-- form code start -->
@ -389,4 +419,6 @@
<!-- htmlpopup --> <!-- htmlpopup -->

View File

@ -69,6 +69,8 @@ amount : [null,[Validators.required]],
select_category : [null], select_category : [null],
total_expenses : [null,[Validators.required]],
@ -76,6 +78,8 @@ select_category : [null],
}); // component_button200 }); // component_button200
// form code start // form code start
this.extensionService.getJsonObjectsByFormCodeList(this.formcode).subscribe(data => { this.extensionService.getJsonObjectsByFormCodeList(this.formcode).subscribe(data => {
@ -104,6 +108,8 @@ select_category : [null],
this.getallselect_category(); this.getallselect_category();
} }
@ -112,6 +118,8 @@ this.getallselect_category();
error; error;
getData() { getData() {
this.mainService.getAll().subscribe((data) => { this.mainService.getAll().subscribe((data) => {
@ -135,6 +143,8 @@ this.getallselect_category();
this.modalEdit = true; this.modalEdit = true;
} }
@ -161,6 +171,8 @@ this.getallselect_category();
//console.log("in update"); //console.log("in update");
console.log("id " + id); console.log("id " + id);
console.log(this.rowSelected); console.log(this.rowSelected);
@ -180,6 +192,8 @@ setTimeout(() => {
}, (error) => { }, (error) => {
console.log(error); console.log(error);
if (error.status >= 200 && error.status <= 299) { if (error.status >= 200 && error.status <= 299) {
@ -204,6 +218,8 @@ onCreate() {
this.mainService.create(this.entryForm.value).subscribe( this.mainService.create(this.entryForm.value).subscribe(
(data) => { (data) => {
console.log(data); console.log(data);
@ -218,6 +234,8 @@ setTimeout(() => {
}, (error) => { }, (error) => {
console.log(error); console.log(error);
@ -242,6 +260,8 @@ this.modalAdd = true; this.submitted = false;
} }
submitted = false; submitted = false;
@ -266,6 +286,8 @@ this.selectselect_category = data;
console.log(data); console.log(data);
},(error) => { console.log(error); }); } },(error) => { console.log(error); }); }
// updateaction // updateaction
} }
@ -273,3 +295,5 @@ console.log(data);

View File

@ -36,5 +36,7 @@ export class Expensesservice{
getAllselect_category(): Observable<any> { getAllselect_category(): Observable<any> {
return this.apiRequest.get("Categories_ListFilter1/Categories_ListFilter1"); } return this.apiRequest.get("Categories_ListFilter1/Categories_ListFilter1"); }
// updateaction // updateaction
} }

View File

@ -1,3 +1,8 @@
import { CategoriesComponent } from './BuilderComponents/basic/Categories/Categories.component'; import { CategoriesComponent } from './BuilderComponents/basic/Categories/Categories.component';
import { ExpensesComponent } from './BuilderComponents/basic/Expenses/Expenses.component'; import { ExpensesComponent } from './BuilderComponents/basic/Expenses/Expenses.component';
import { NotesComponent } from './BuilderComponents/basic/Notes/Notes.component'; import { NotesComponent } from './BuilderComponents/basic/Notes/Notes.component';
@ -261,6 +266,16 @@ const routes: Routes = [
// buildercomponents // buildercomponents
{path:'Categories',component:CategoriesComponent}, {path:'Categories',component:CategoriesComponent},

View File

@ -1,3 +1,8 @@
import { CategoriesComponent } from './BuilderComponents/basic/Categories/Categories.component'; import { CategoriesComponent } from './BuilderComponents/basic/Categories/Categories.component';
import { ExpensesComponent } from './BuilderComponents/basic/Expenses/Expenses.component'; import { ExpensesComponent } from './BuilderComponents/basic/Expenses/Expenses.component';
import { NotesComponent } from './BuilderComponents/basic/Notes/Notes.component'; import { NotesComponent } from './BuilderComponents/basic/Notes/Notes.component';
@ -134,6 +139,16 @@ import { Stepper_workflowComponent } from './BuilderComponents/stepperworkflow/S
// buildercomponents // buildercomponents
CategoriesComponent, CategoriesComponent,

View File

@ -236,6 +236,7 @@
"Title": "Title", "Title": "Title",
"select_Category": "select_Category", "select_Category": "select_Category",
"Journal": "Journal", "Journal": "Journal",
"Total_Expenses": "Total_Expenses",
"Name": "Name", "Name": "Name",
"Note_Title": "Note_Title", "Note_Title": "Note_Title",
"Notes": "Notes", "Notes": "Notes",