rushilwiz/astute
1
0
Fork 0
mirror of https://github.com/dyiop/astute.git synced 2025-04-05 21:10:16 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug fixes

Browse Source
This commit is contained in:
gopi17701 2019-04-05 20:47:00 -04:00
parent dbb904d7c2
commit c4d1ba52fe
10 changed files with 163 additions and 249 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
AstuteClient2/src/app/app-routing.module.ts
View File

@ -1,32 +1,34 @@
import { NgModule } from '@angular/core'; import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common'; import { CommonModule } from '@angular/common';
import {RouterModule, Routes} from '@angular/router'; import {RouterModule, Routes} from '@angular/router';
import {CustomerComponent} from './customer/customer.component'; import {CustomerComponent} from './customer/customer.component';
import {SalesOrderComponent} from './sales-order/sales-order.component'; import {SalesOrderComponent} from './sales-order/sales-order.component';
import {InvoiceComponent} from './invoice/invoice.component'; import {InvoiceComponent} from './invoice/invoice.component';
import {HomepageComponent} from './homepage/homepage.component'; import {HomepageComponent} from './homepage/homepage.component';
import {InvoiceGenComponent} from './invoice-gen/invoice-gen.component'; import {InvoiceGenComponent} from './invoice-gen/invoice-gen.component';
import {InvoicePaymentComponent} from './invoice-payment/invoice-payment.component'; import {InvoicePaymentComponent} from './invoice-payment/invoice-payment.component';
import {LoginComponent} from './login/login.component'; import {ServiceTypeComponent} from './service-type/service-type.component';
import {LoginComponent} from './login/login.component';
const routes: Routes = [
{ path: '', redirectTo: 'login', pathMatch: 'full'}, const routes: Routes = [
{ path: 'home', redirectTo: 'homepage', pathMatch: 'full'}, { path: '', redirectTo: 'login', pathMatch: 'full'},
{ path: 'homepage', component: HomepageComponent }, { path: 'home', redirectTo: 'homepage', pathMatch: 'full'},
{ path: 'customer', component: CustomerComponent }, { path: 'homepage', component: HomepageComponent },
{ path: 'sales-order', component: SalesOrderComponent }, { path: 'customer', component: CustomerComponent },
{ path: 'invoice', component: InvoiceComponent }, { path: 'sales-order', component: SalesOrderComponent },
{ path: 'invoice-gen', component: InvoiceGenComponent }, { path: 'invoice', component: InvoiceComponent },
{ path: 'invoice-payment', component: InvoicePaymentComponent }, { path: 'invoice-gen', component: InvoiceGenComponent },
{ path: 'login', component: LoginComponent } { path: 'invoice-payment', component: InvoicePaymentComponent },
]; { path: 'service-type', component: ServiceTypeComponent},
{ path: 'login', component: LoginComponent }
@NgModule({ ];
exports: [RouterModule],
imports: [ @NgModule({
CommonModule, exports: [RouterModule],
RouterModule.forRoot(routes) imports: [
], CommonModule,
declarations: [] RouterModule.forRoot(routes)
}) ],
export class AppRoutingModule { } declarations: []
})
export class AppRoutingModule { }

108
AstuteClient2/src/app/app.module.ts
View File

@ -1,53 +1,55 @@
import { BrowserModule } from '@angular/platform-browser'; import { BrowserModule } from '@angular/platform-browser';
import { NgModule } from '@angular/core'; import { NgModule } from '@angular/core';
import { AppComponent } from './app.component'; import { AppComponent } from './app.component';
import { CustomerComponent } from './customer/customer.component'; import { CustomerComponent } from './customer/customer.component';
import { AstuteClientService } from './services/astute-client-service'; import { AstuteClientService } from './services/astute-client-service';
import { AgGridModule } from 'ag-grid-angular'; import { AgGridModule } from 'ag-grid-angular';
import { ModalFormComponent } from './modal-form/modal-form.component'; import { ModalFormComponent } from './modal-form/modal-form.component';
import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
import {HttpClientModule} from '@angular/common/http'; import {HttpClientModule} from '@angular/common/http';
import { AppRoutingModule } from './/app-routing.module'; import { AppRoutingModule } from './/app-routing.module';
import { NavBarComponent } from './nav-bar/nav-bar.component'; import { NavBarComponent } from './nav-bar/nav-bar.component';
import { SalesOrderComponent } from './sales-order/sales-order.component'; import { SalesOrderComponent } from './sales-order/sales-order.component';
import { InvoiceComponent } from './invoice/invoice.component'; import { InvoiceComponent } from './invoice/invoice.component';
import { HomepageComponent } from './homepage/homepage.component'; import { HomepageComponent } from './homepage/homepage.component';
import { AppBoxComponent } from './app-box/app-box.component'; import { AppBoxComponent } from './app-box/app-box.component';
import { InvoiceGenComponent } from './invoice-gen/invoice-gen.component'; import { InvoiceGenComponent } from './invoice-gen/invoice-gen.component';
import { TextMaskModule } from 'angular2-text-mask'; import { TextMaskModule } from 'angular2-text-mask';
import { LoginComponent } from './login/login.component'; import { LoginComponent } from './login/login.component';
import { InvoicePaymentComponent } from './invoice-payment/invoice-payment.component'; import { InvoicePaymentComponent } from './invoice-payment/invoice-payment.component';
import { CommonModule } from '@angular/common'; import { CommonModule } from '@angular/common';
import { FormsModule } from '@angular/forms'; import { FormsModule } from '@angular/forms';
import { ReactiveFormsModule } from '@angular/forms'; import { ReactiveFormsModule } from '@angular/forms';
import { ServiceTypeComponent } from './service-type/service-type.component';
@NgModule({
declarations: [ @NgModule({
AppComponent, declarations: [
CustomerComponent, AppComponent,
ModalFormComponent, CustomerComponent,
NavBarComponent, ModalFormComponent,
SalesOrderComponent, NavBarComponent,
InvoiceComponent, SalesOrderComponent,
HomepageComponent, InvoiceComponent,
AppBoxComponent, HomepageComponent,
InvoiceGenComponent, AppBoxComponent,
LoginComponent, InvoiceGenComponent,
InvoicePaymentComponent LoginComponent,
], InvoicePaymentComponent,
imports: [ ServiceTypeComponent
BrowserModule, ],
AgGridModule.withComponents([]), imports: [
NgbModule.forRoot(), BrowserModule,
HttpClientModule, AgGridModule.withComponents([]),
AppRoutingModule, NgbModule.forRoot(),
TextMaskModule, HttpClientModule,
CommonModule, AppRoutingModule,
FormsModule, TextMaskModule,
ReactiveFormsModule CommonModule,
], FormsModule,
providers: [AstuteClientService], ReactiveFormsModule
bootstrap: [AppComponent] ],
}) providers: [AstuteClientService],
export class AppModule { } bootstrap: [AppComponent]
})
export class AppModule { }

1
AstuteClient2/src/app/nav-bar/nav-bar.component.html
View File

@ -9,6 +9,7 @@
<a class="nav-link" [ngClass]="salesOrderActive ? 'active' : ''"routerLink="/sales-order" routerLinkActive="active">Sales Order</a> <a class="nav-link" [ngClass]="salesOrderActive ? 'active' : ''"routerLink="/sales-order" routerLinkActive="active">Sales Order</a>
<a class="nav-link" [ngClass]="invoiceActive ? 'active' : ''"routerLink="/invoice" routerLinkActive="active">Invoice</a> <a class="nav-link" [ngClass]="invoiceActive ? 'active' : ''"routerLink="/invoice" routerLinkActive="active">Invoice</a>
<a class="nav-link" [ngClass]="invoicePaymentActive ? 'active' : ''"routerLink="/invoice-payment" routerLinkActive="active">Invoice Payment</a> <a class="nav-link" [ngClass]="invoicePaymentActive ? 'active' : ''"routerLink="/invoice-payment" routerLinkActive="active">Invoice Payment</a>
<a class="nav-link" [ngClass]="serviceTypeActive ? 'active' : ''"routerLink="/service-type" routerLinkActive="active">Service Type</a>
<a class="nav-link" [ngClass]="logoffActive ? 'active' : ''"routerLink="/login" routerLinkActive="active">Log off</a> <a class="nav-link" [ngClass]="logoffActive ? 'active' : ''"routerLink="/login" routerLinkActive="active">Log off</a>
</div> </div>
</div> </div>

1
AstuteClient2/src/app/nav-bar/nav-bar.component.ts
View File

@ -10,6 +10,7 @@ export class NavBarComponent implements OnInit {
@Input() salesOrderActive: boolean; @Input() salesOrderActive: boolean;
@Input() invoiceActive: boolean; @Input() invoiceActive: boolean;
@Input() invoicePaymentActive: boolean; @Input() invoicePaymentActive: boolean;
@Input() serviceTypeActive: boolean;
@Input() logoffActive: boolean; @Input() logoffActive: boolean;

147
AstuteClient2/src/app/services/astute-client-service.ts
View File

@ -15,6 +15,7 @@ export class AstuteClientService {
private invoiceDetailUrl = 'http://localhost:8080/astutesystem/invoice/detail'; private invoiceDetailUrl = 'http://localhost:8080/astutesystem/invoice/detail';
private invoiceGenUrl = 'http://localhost:8080/astutesystem/invoice/generatedInvoice'; private invoiceGenUrl = 'http://localhost:8080/astutesystem/invoice/generatedInvoice';
private invoicePaymentUrl = 'http://localhost:8080/astutesystem/invoicePayment'; private invoicePaymentUrl = 'http://localhost:8080/astutesystem/invoicePayment';
private serviceTypeUrl = 'http://localhost:8080/astutesystem/serviceType';
private sessionId = localStorage.getItem(''); private sessionId = localStorage.getItem('');
private sessionString = `?sessionId=${this.sessionId}`; private sessionString = `?sessionId=${this.sessionId}`;
@ -119,17 +120,6 @@ export class AstuteClientService {
}); });
} }
public getServiceTypes(): Promise<any> {
console.log("*** In getPOServiceTypes()");
const url = `${this.POServiceTypesUrl}`;
return this.http.get(url)
.toPromise()
.then(response => {
console.log(response['entity']);
return response['entity'];
});
}
public getPODetail(ponum): Promise<any> { public getPODetail(ponum): Promise<any> {
console.log("*** In getPODetails()"); console.log("*** In getPODetails()");
const url = `${this.PODetailUrl}?PONum=${ponum}`; const url = `${this.PODetailUrl}?PONum=${ponum}`;
@ -158,12 +148,6 @@ export class AstuteClientService {
.then(response => response['entity']); .then(response => response['entity']);
} }
// String serviceDesc;
// int feeTypeId;
// Double qty;
// int serviceTypeId;
// String schedule;
// Date deliverBy;
public updatePODetail(ponum, lineItemNo, data) { public updatePODetail(ponum, lineItemNo, data) {
console.log("*** In updatePODetail()"); console.log("*** In updatePODetail()");
const sessionId = localStorage.getItem('sessionId'); const sessionId = localStorage.getItem('sessionId');
@ -363,108 +347,33 @@ export class AstuteClientService {
.then(response => response['entity']); .then(response => response['entity']);
} }
// public getRecord(patientId: number): Promise<any> { // **************************************** Service Type methods
// const url = `${this.recordsUrl}/${patientId}?sessionId=${this.getSessionId()}`;
// return this.http.get(url)
// .toPromise()
// .then(response => {
// console.log(response);
// });
// }
//
// public getInfo(patientId: number): Promise<any> {
// const url = `${this.recordsUrl}/${patientId}?sessionId=${this.getSessionId()}`;
// return this.http.get(url)
// .toPromise()
// .then(response => {
// return response['entity'];
// });
// }
//
// public getVisits(patientId: number): Promise<any> {
// const url = `${this.recordsUrl}/${patientId}/visits?sessionId=${this.getSessionId()}`;
// return this.http.get(url)
// .toPromise()
// .then(response => {
// return response['entity'];
// });
// }
//
// public getAllVisits(): Promise<any> {
// const url = `${this.recordsUrl}/visits?sessionId=${this.getSessionId()}`;
// return this.http.get(url)
// .toPromise()
// .then(response => {
// return response['entity'];
// });
// }
//
// public getVitals(visitId: number): Promise<any> {
// const url = `${this.visitsUrl}/${visitId}/vitals?sessionId=${this.getSessionId()}`;
// return this.http.get(url)
// .toPromise()
// .then(response => {
// return response['entity'];
// });
// }
//
// public getLatestVitals(patientId: number): Promise<any> {
// const url = `${this.recordsUrl}/${patientId}/vitals?sessionId=${this.getSessionId()}`;
// return this.http.get(url)
// .toPromise()
// .then(response => {
// return response['entity'];
// });
// }
//
// public updateInfo(patientId: number, data: any): Promise<any> {
// const url = `${this.recordsUrl}/${patientId}?sessionId=${this.getSessionId()}`;
// return this.http.put(url, data)
// .toPromise()
// .then(response => response['entity']);
// }
// public updateVisit(patientId: number, visit: any): Promise<any> {
// console.log(visit);
//
// const url = `${this.recordsUrl}/${patientId}/visits/${visit.visitId}?sessionId=${this.getSessionId()}`;
// return this.http.put(url, visit)
// .toPromise()
// .then(response => {
// console.log(response['entity']);
// return response['entity'];
// });
// }
//
// public getSessionPatientId(): Promise<number> {
// const url = `${this.sessionsUrl}/${this.getSessionId()}`;
// console.log(url);
// return this.http.get(url)
// .toPromise()
// .then(response => {
// console.log(response);
// return response['entity'].patientId;
// });
// }
//
// public startVisit(patientId: number): Promise<any> {
// const url = `${this.recordsUrl}/${patientId}/visits?${this.getSessionId()}`;
// return this.http.post(url, null)
// .toPromise()
// .then(response => {
// console.log(response);
// return response['entity'];
// });
// }
//
// getMedications() {
// const url = `${this.medsUrl}?${this.getSessionId()}`;
// return this.http.get(url)
// .toPromise()
// .then(response => {
// console.log(response);
// return response['entity'];
// });
// }
public getServiceTypes(): Promise<any> {
console.log("*** In getPOServiceTypes()");
const url = `${this.serviceTypeUrl}`;
return this.http.get(url)
.toPromise()
.then(response => {
console.log(response['entity']);
return response['entity'];
});
}
public updateServiceType(serviceTypeId, serviceTypeDesc, data: any): Promise<any> {
console.log("*** In updateServiceType()");
const url = `${this.serviceTypeUrl}/${serviceTypeId}/?desc=${serviceTypeDesc}`; //TODO send sessionId
console.log("*** updateServiceType is " + url);
return this.http.put(url, data)
.toPromise()
.then(response => response['entity']);
}
public createServiceType(data: any): Promise<any> {
console.log("*** In createServiceType()");
const url = `${this.serviceTypeUrl}`; //TODO send sessionId
return this.http.post(url, data)
.toPromise()
.then(response => response['entity']);
}
} }

59
AstuteSystem/src/main/java/com/astute/model/ServiceType.java
View File

@ -1,30 +1,29 @@
package com.astute.model; package com.astute.model;
import java.sql.Date;
public class ServiceType {
public class ServiceType { int serviceTypeId;
int serviceTypeId; String serviceTypeDesc;
String desc;
public int getServiceTypeId() {
public int getServiceTypeId() { return serviceTypeId;
return serviceTypeId; }
}
public void setServiceTypeId(int serviceTypeId) {
public void setServiceTypeId(int serviceTypeId) { this.serviceTypeId = serviceTypeId;
this.serviceTypeId = serviceTypeId; }
}
public String getServiceTypeDesc() {
public String getDesc() { return serviceTypeDesc;
return desc; }
}
public void setServiceTypeDesc(String serviceTypeDesc) {
public void setDesc(String desc) { this.serviceTypeDesc = serviceTypeDesc;
this.desc = desc; }
}
public ServiceType(int serviceTypeId, String serviceTypeDesc) {
public ServiceType(int serviceTypeId, String desc) { this.serviceTypeId = serviceTypeId;
this.serviceTypeId = serviceTypeId; this.serviceTypeDesc = serviceTypeDesc;
this.desc = desc; }
}
}
}

12
AstuteSystem/src/main/java/com/astute/requests/ServiceTypeRequest.java
View File

@ -2,7 +2,7 @@ package com.astute.requests;
public class ServiceTypeRequest { public class ServiceTypeRequest {
int serviceTypeId; int serviceTypeId;
String desc; String serviceTypeDesc;
public int getServiceTypeId() { public int getServiceTypeId() {
return serviceTypeId; return serviceTypeId;
@ -12,17 +12,17 @@ public class ServiceTypeRequest {
this.serviceTypeId = serviceTypeId; this.serviceTypeId = serviceTypeId;
} }
public String getDesc() { public String getServiceTypeDesc() {
return desc; return serviceTypeDesc;
} }
public void setDesc(String desc) { public void setServiceTypeDesc(String serviceTypeDesc) {
this.desc = desc; this.serviceTypeDesc = serviceTypeDesc;
} }
public ServiceTypeRequest(int serviceTypeId, String desc) { public ServiceTypeRequest(int serviceTypeId, String desc) {
this.serviceTypeId = serviceTypeId; this.serviceTypeId = serviceTypeId;
this.desc = desc; this.serviceTypeDesc = serviceTypeDesc;
} }
} }

4
AstuteSystem/src/main/java/com/astute/resources/POResource.java
View File

@ -76,7 +76,7 @@ public class POResource {
// Finalize // Finalize
@Path("/{PONum}/finalize") @Path("/{PONum}/finalize")
@POST @PUT
public Response finalizePO(@PathParam("PONum") String PONum) throws AstuteException { public Response finalizePO(@PathParam("PONum") String PONum) throws AstuteException {
POService.finalizePO(PONum); POService.finalizePO(PONum);
return new ApiResponse(ApiResponse.UPDATE_ACCESS_SUCESS).toResponse(); return new ApiResponse(ApiResponse.UPDATE_ACCESS_SUCESS).toResponse();
@ -84,7 +84,7 @@ public class POResource {
// delete // delete
@Path("/{PONum}/delete") @Path("/{PONum}/delete")
@POST @PUT
public Response deletePO(@PathParam("PONum") String PONum) throws AstuteException { public Response deletePO(@PathParam("PONum") String PONum) throws AstuteException {
POService.deletePO(PONum); POService.deletePO(PONum);
return new ApiResponse(ApiResponse.UPDATE_ACCESS_SUCESS).toResponse(); return new ApiResponse(ApiResponse.UPDATE_ACCESS_SUCESS).toResponse();

6
AstuteSystem/src/main/java/com/astute/resources/ServiceTypeResource.java
View File

@ -34,10 +34,10 @@ public class ServiceTypeResource {
@Path("/{serviceTypeId}") @Path("/{serviceTypeId}")
@PUT @PUT
public Response updateServiceType(@PathParam("serviceTypeId") int serviceTypeId, @QueryParam("desc") String desc) public Response updateServiceType(@PathParam("serviceTypeId") int serviceTypeId, @QueryParam("serviceTypeDesc") String serviceTypeDesc)
throws AstuteException { throws AstuteException {
System.out.println("in updateServiceType()"); System.out.println("in updateServiceType()");
service.updateServiceType(serviceTypeId, desc); service.updateServiceType(serviceTypeId, serviceTypeDesc);
return new ApiResponse(ApiResponse.UPDATE_ACCESS_SUCESS).toResponse(); return new ApiResponse(ApiResponse.UPDATE_ACCESS_SUCESS).toResponse();
} }
@ -54,7 +54,7 @@ public class ServiceTypeResource {
public Response createServiceType(ServiceTypeRequest request) public Response createServiceType(ServiceTypeRequest request)
throws AstuteException { throws AstuteException {
System.out.println("in AstuteSyste createServiceType()"); System.out.println("in AstuteSyste createServiceType()");
service.createServiceType(request.getDesc()); service.createServiceType(request.getServiceTypeDesc());
return new ApiResponse(ApiResponse.UPDATE_ACCESS_SUCESS).toResponse(); return new ApiResponse(ApiResponse.UPDATE_ACCESS_SUCESS).toResponse();
} }
} }

8
AstuteSystem/src/main/java/com/astute/service/ServiceTypeService.java
View File

@ -19,12 +19,12 @@ public class ServiceTypeService extends Service{
return getDao().getServiceTypes(); return getDao().getServiceTypes();
} }
public void createServiceType(String desc) throws AstuteException { public void createServiceType(String serviceTypeDesc) throws AstuteException {
getDao().createServiceType(desc); getDao().createServiceType(serviceTypeDesc);
} }
public void updateServiceType(int serviceTypeId, String desc) throws AstuteException { public void updateServiceType(int serviceTypeId, String serviceTypeDesc) throws AstuteException {
getDao().updateServiceType(serviceTypeId, desc); getDao().updateServiceType(serviceTypeId, serviceTypeDesc);
} }
public void deleteServiceType(int serviceTypeId) throws AstuteException { public void deleteServiceType(int serviceTypeId) throws AstuteException {