diff --git a/foundersfriend003-backf-b/authsec_springboot/backend/src/main/java/com/realnet/Builders/Services/BuilderService.java b/foundersfriend003-backf-b/authsec_springboot/backend/src/main/java/com/realnet/Builders/Services/BuilderService.java
index 7f0df40..053648a 100644
--- a/foundersfriend003-backf-b/authsec_springboot/backend/src/main/java/com/realnet/Builders/Services/BuilderService.java
+++ b/foundersfriend003-backf-b/authsec_springboot/backend/src/main/java/com/realnet/Builders/Services/BuilderService.java
@@ -81,6 +81,21 @@ addCustomMenu( "Notes","Notes", "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");
diff --git a/foundersfriend003-backf-b/authsec_springboot/backend/src/main/java/com/realnet/basic/Controllers/ExpensesController.java b/foundersfriend003-backf-b/authsec_springboot/backend/src/main/java/com/realnet/basic/Controllers/ExpensesController.java
index aac7e5f..4cf1c16 100644
--- a/foundersfriend003-backf-b/authsec_springboot/backend/src/main/java/com/realnet/basic/Controllers/ExpensesController.java
+++ b/foundersfriend003-backf-b/authsec_springboot/backend/src/main/java/com/realnet/basic/Controllers/ExpensesController.java
@@ -22,6 +22,8 @@ import com.realnet.basic.Services.ExpensesService ;
+
+
@RequestMapping(value = "/Expenses")
@CrossOrigin("*")
@RestController
@@ -38,6 +40,8 @@ public class ExpensesController {
+
+
@PostMapping("/Expenses")
public Expenses Savedata(@RequestBody Expenses data) {
Expenses save = Service.Savedata(data) ;
@@ -46,6 +50,8 @@ public class ExpensesController {
+
+
System.out.println("data saved..." + save);
return save;
@@ -96,4 +102,6 @@ public class ExpensesController {
+
+
}
\ No newline at end of file
diff --git a/foundersfriend003-backf-b/authsec_springboot/backend/src/main/java/com/realnet/basic/Controllers/tokenFree_ExpensesController.java b/foundersfriend003-backf-b/authsec_springboot/backend/src/main/java/com/realnet/basic/Controllers/tokenFree_ExpensesController.java
index 2e5a634..648b346 100644
--- a/foundersfriend003-backf-b/authsec_springboot/backend/src/main/java/com/realnet/basic/Controllers/tokenFree_ExpensesController.java
+++ b/foundersfriend003-backf-b/authsec_springboot/backend/src/main/java/com/realnet/basic/Controllers/tokenFree_ExpensesController.java
@@ -22,6 +22,8 @@ import com.realnet.basic.Services.ExpensesService ;
+
+
@RequestMapping(value = "/token/Expenses")
@CrossOrigin("*")
@RestController
@@ -38,6 +40,8 @@ public class tokenFree_ExpensesController {
+
+
@PostMapping("/Expenses")
public Expenses Savedata(@RequestBody Expenses data) {
Expenses save = Service.Savedata(data) ;
@@ -46,6 +50,8 @@ public class tokenFree_ExpensesController {
+
+
System.out.println("data saved..." + save);
return save;
@@ -96,4 +102,6 @@ public class tokenFree_ExpensesController {
+
+
}
\ No newline at end of file
diff --git a/foundersfriend003-backf-b/authsec_springboot/backend/src/main/java/com/realnet/basic/Entity/Expenses.java b/foundersfriend003-backf-b/authsec_springboot/backend/src/main/java/com/realnet/basic/Entity/Expenses.java
index 1214c39..220918f 100644
--- a/foundersfriend003-backf-b/authsec_springboot/backend/src/main/java/com/realnet/basic/Entity/Expenses.java
+++ b/foundersfriend003-backf-b/authsec_springboot/backend/src/main/java/com/realnet/basic/Entity/Expenses.java
@@ -10,6 +10,8 @@ import com.realnet.WhoColumn.Entity.Extension;
+
+
@Entity
@Data
public class Expenses extends Extension {
@@ -30,5 +32,7 @@ private int amount;
private String select_category;
private String select_categoryname;
+private int total_expenses;
+
}
diff --git a/foundersfriend003-backf-b/authsec_springboot/backend/src/main/java/com/realnet/basic/Repository/ExpensesRepository.java b/foundersfriend003-backf-b/authsec_springboot/backend/src/main/java/com/realnet/basic/Repository/ExpensesRepository.java
index 6870f6c..1e963a7 100644
--- a/foundersfriend003-backf-b/authsec_springboot/backend/src/main/java/com/realnet/basic/Repository/ExpensesRepository.java
+++ b/foundersfriend003-backf-b/authsec_springboot/backend/src/main/java/com/realnet/basic/Repository/ExpensesRepository.java
@@ -14,6 +14,8 @@ import java.util.*;
+
+
diff --git a/foundersfriend003-backf-b/authsec_springboot/backend/src/main/java/com/realnet/basic/Services/ExpensesService.java b/foundersfriend003-backf-b/authsec_springboot/backend/src/main/java/com/realnet/basic/Services/ExpensesService.java
index b56ba89..5023bae 100644
--- a/foundersfriend003-backf-b/authsec_springboot/backend/src/main/java/com/realnet/basic/Services/ExpensesService.java
+++ b/foundersfriend003-backf-b/authsec_springboot/backend/src/main/java/com/realnet/basic/Services/ExpensesService.java
@@ -21,6 +21,8 @@ import com.realnet.basic.Services.CategoriesService;
+
+
import org.springframework.stereotype.Service;
@Service
@@ -37,6 +39,8 @@ private ExpensesRepository Repository;
@Autowired
private CategoriesService select_categoryserv;
+
+
public Expenses Savedata(Expenses data) {
@@ -62,6 +66,8 @@ Categories get = select_categoryserv.getdetailsbyId(select_categoryId);
+
+
data.setUpdatedBy(getUser().getUserId());
data.setCreatedBy(getUser().getUserId());
data.setAccountId(getUser().getAccount().getAccount_id());
@@ -99,6 +105,8 @@ old.setAmount(data.getAmount());
old.setSelect_category(data.getSelect_category());
+old.setTotal_expenses(data.getTotal_expenses());
+
final Expenses test = Repository.save(old);
data.setUpdatedBy(getUser().getUserId());
return test;}
@@ -108,6 +116,8 @@ final Expenses test = Repository.save(old);
+
+
public AppUser getUser() {
AppUser user = userService.getLoggedInUser();
return user;
diff --git a/foundersfriend003-dbf-d/authsec_mysql/mysql/wf_table/wf_table.sql b/foundersfriend003-dbf-d/authsec_mysql/mysql/wf_table/wf_table.sql
index 5b1fdbf..c0249cc 100755
--- a/foundersfriend003-dbf-d/authsec_mysql/mysql/wf_table/wf_table.sql
+++ b/foundersfriend003-dbf-d/authsec_mysql/mysql/wf_table/wf_table.sql
@@ -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.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));
diff --git a/foundersfriend003-frontf-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basic/Expenses/Expenses.component.html b/foundersfriend003-frontf-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basic/Expenses/Expenses.component.html
index bc00ffd..c4d89dc 100644
--- a/foundersfriend003-frontf-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basic/Expenses/Expenses.component.html
+++ b/foundersfriend003-frontf-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basic/Expenses/Expenses.component.html
@@ -34,6 +34,10 @@
select Category
+
+ Total Expenses
+
+
@@ -52,6 +56,9 @@
{{user. select_categoryname }}
+
+{{user.total_expenses }}
+
@@ -214,6 +221,8 @@
+
+
Update Expenses
@@ -223,6 +232,8 @@
+
+
{{rowSelected.id}}
@@ -249,6 +260,11 @@
+
+
+
+
+
@@ -256,6 +272,8 @@
+
+
+
@@ -351,6 +379,8 @@
+
+
@@ -389,4 +419,6 @@
+
+
diff --git a/foundersfriend003-frontf-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basic/Expenses/Expenses.component.ts b/foundersfriend003-frontf-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basic/Expenses/Expenses.component.ts
index 57285d5..ee63368 100644
--- a/foundersfriend003-frontf-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basic/Expenses/Expenses.component.ts
+++ b/foundersfriend003-frontf-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basic/Expenses/Expenses.component.ts
@@ -69,6 +69,8 @@ amount : [null,[Validators.required]],
select_category : [null],
+total_expenses : [null,[Validators.required]],
+
@@ -76,6 +78,8 @@ select_category : [null],
+
+
}); // component_button200
// form code start
this.extensionService.getJsonObjectsByFormCodeList(this.formcode).subscribe(data => {
@@ -104,6 +108,8 @@ select_category : [null],
this.getallselect_category();
+
+
}
@@ -112,6 +118,8 @@ this.getallselect_category();
+
+
error;
getData() {
this.mainService.getAll().subscribe((data) => {
@@ -135,6 +143,8 @@ this.getallselect_category();
+
+
this.modalEdit = true;
}
@@ -161,6 +171,8 @@ this.getallselect_category();
+
+
//console.log("in update");
console.log("id " + id);
console.log(this.rowSelected);
@@ -180,6 +192,8 @@ setTimeout(() => {
+
+
}, (error) => {
console.log(error);
if (error.status >= 200 && error.status <= 299) {
@@ -204,6 +218,8 @@ onCreate() {
+
+
this.mainService.create(this.entryForm.value).subscribe(
(data) => {
console.log(data);
@@ -218,6 +234,8 @@ setTimeout(() => {
+
+
}, (error) => {
console.log(error);
@@ -242,6 +260,8 @@ this.modalAdd = true; this.submitted = false;
+
+
}
submitted = false;
@@ -266,6 +286,8 @@ this.selectselect_category = data;
console.log(data);
},(error) => { console.log(error); }); }
+
+
// updateaction
}
@@ -273,3 +295,5 @@ console.log(data);
+
+
diff --git a/foundersfriend003-frontf-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basic/Expenses/Expenses.service.ts b/foundersfriend003-frontf-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basic/Expenses/Expenses.service.ts
index 18cc582..8c3f78f 100644
--- a/foundersfriend003-frontf-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basic/Expenses/Expenses.service.ts
+++ b/foundersfriend003-frontf-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basic/Expenses/Expenses.service.ts
@@ -36,5 +36,7 @@ export class Expensesservice{
getAllselect_category(): Observable {
return this.apiRequest.get("Categories_ListFilter1/Categories_ListFilter1"); }
+
+
// updateaction
}
\ No newline at end of file
diff --git a/foundersfriend003-frontf-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main-routing.module.ts b/foundersfriend003-frontf-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main-routing.module.ts
index c55d60e..2703e23 100644
--- a/foundersfriend003-frontf-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main-routing.module.ts
+++ b/foundersfriend003-frontf-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main-routing.module.ts
@@ -1,3 +1,8 @@
+
+
+
+
+
import { CategoriesComponent } from './BuilderComponents/basic/Categories/Categories.component';
import { ExpensesComponent } from './BuilderComponents/basic/Expenses/Expenses.component';
import { NotesComponent } from './BuilderComponents/basic/Notes/Notes.component';
@@ -261,6 +266,16 @@ const routes: Routes = [
// buildercomponents
+
+
+
+
+
+
+
+
+
+
{path:'Categories',component:CategoriesComponent},
diff --git a/foundersfriend003-frontf-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main.module.ts b/foundersfriend003-frontf-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main.module.ts
index 7981a58..c4f1cba 100644
--- a/foundersfriend003-frontf-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main.module.ts
+++ b/foundersfriend003-frontf-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main.module.ts
@@ -1,3 +1,8 @@
+
+
+
+
+
import { CategoriesComponent } from './BuilderComponents/basic/Categories/Categories.component';
import { ExpensesComponent } from './BuilderComponents/basic/Expenses/Expenses.component';
import { NotesComponent } from './BuilderComponents/basic/Notes/Notes.component';
@@ -134,6 +139,16 @@ import { Stepper_workflowComponent } from './BuilderComponents/stepperworkflow/S
// buildercomponents
+
+
+
+
+
+
+
+
+
+
CategoriesComponent,
diff --git a/foundersfriend003-frontf-f/authsec_angular/frontend/angular-clarity-master/src/assets/i18n/en.json b/foundersfriend003-frontf-f/authsec_angular/frontend/angular-clarity-master/src/assets/i18n/en.json
index f9864ae..e6b6f1e 100644
--- a/foundersfriend003-frontf-f/authsec_angular/frontend/angular-clarity-master/src/assets/i18n/en.json
+++ b/foundersfriend003-frontf-f/authsec_angular/frontend/angular-clarity-master/src/assets/i18n/en.json
@@ -236,6 +236,7 @@
"Title": "Title",
"select_Category": "select_Category",
"Journal": "Journal",
+ "Total_Expenses": "Total_Expenses",
"Name": "Name",
"Note_Title": "Note_Title",
"Notes": "Notes",