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

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

@ -7,6 +7,7 @@ import {InvoiceComponent} from './invoice/invoice.component';
import {HomepageComponent} from './homepage/homepage.component';
import {InvoiceGenComponent} from './invoice-gen/invoice-gen.component';
import {InvoicePaymentComponent} from './invoice-payment/invoice-payment.component';
import {ServiceTypeComponent} from './service-type/service-type.component';
import {LoginComponent} from './login/login.component';
const routes: Routes = [
@ -18,6 +19,7 @@ const routes: Routes = [
{ path: 'invoice', component: InvoiceComponent },
{ path: 'invoice-gen', component: InvoiceGenComponent },
{ path: 'invoice-payment', component: InvoicePaymentComponent },
{ path: 'service-type', component: ServiceTypeComponent},
{ path: 'login', component: LoginComponent }
];

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

@ -21,6 +21,7 @@ import { InvoicePaymentComponent } from './invoice-payment/invoice-payment.compo
import { CommonModule } from '@angular/common';
import { FormsModule } from '@angular/forms';
import { ReactiveFormsModule } from '@angular/forms';
import { ServiceTypeComponent } from './service-type/service-type.component';
@NgModule({
declarations: [
@ -34,7 +35,8 @@ import { ReactiveFormsModule } from '@angular/forms';
AppBoxComponent,
InvoiceGenComponent,
LoginComponent,
InvoicePaymentComponent
InvoicePaymentComponent,
ServiceTypeComponent
],
imports: [
BrowserModule,

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]="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]="serviceTypeActive ? 'active' : ''"routerLink="/service-type" routerLinkActive="active">Service Type</a>
<a class="nav-link" [ngClass]="logoffActive ? 'active' : ''"routerLink="/login" routerLinkActive="active">Log off</a>
</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() invoiceActive: boolean;
@Input() invoicePaymentActive: boolean;
@Input() serviceTypeActive: 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 invoiceGenUrl = 'http://localhost:8080/astutesystem/invoice/generatedInvoice';
private invoicePaymentUrl = 'http://localhost:8080/astutesystem/invoicePayment';
private serviceTypeUrl = 'http://localhost:8080/astutesystem/serviceType';
private sessionId = localStorage.getItem('');
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> {
console.log("*** In getPODetails()");
const url = `${this.PODetailUrl}?PONum=${ponum}`;
@ -158,12 +148,6 @@ export class AstuteClientService {
.then(response => response['entity']);
}
// String serviceDesc;
// int feeTypeId;
// Double qty;
// int serviceTypeId;
// String schedule;
// Date deliverBy;
public updatePODetail(ponum, lineItemNo, data) {
console.log("*** In updatePODetail()");
const sessionId = localStorage.getItem('sessionId');
@ -363,108 +347,33 @@ export class AstuteClientService {
.then(response => response['entity']);
}
// public getRecord(patientId: number): Promise<any> {
// 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'];
// });
// }
// **************************************** Service Type methods
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']);
}
}

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

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

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

@ -2,7 +2,7 @@ package com.astute.requests;
public class ServiceTypeRequest {
int serviceTypeId;
String desc;
String serviceTypeDesc;
public int getServiceTypeId() {
return serviceTypeId;
@ -12,17 +12,17 @@ public class ServiceTypeRequest {
this.serviceTypeId = serviceTypeId;
}
public String getDesc() {
return desc;
public String getServiceTypeDesc() {
return serviceTypeDesc;
}
public void setDesc(String desc) {
this.desc = desc;
public void setServiceTypeDesc(String serviceTypeDesc) {
this.serviceTypeDesc = serviceTypeDesc;
}
public ServiceTypeRequest(int serviceTypeId, String desc) {
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
@Path("/{PONum}/finalize")
@POST
@PUT
public Response finalizePO(@PathParam("PONum") String PONum) throws AstuteException {
POService.finalizePO(PONum);
return new ApiResponse(ApiResponse.UPDATE_ACCESS_SUCESS).toResponse();
@ -84,7 +84,7 @@ public class POResource {
// delete
@Path("/{PONum}/delete")
@POST
@PUT
public Response deletePO(@PathParam("PONum") String PONum) throws AstuteException {
POService.deletePO(PONum);
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}")
@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 {
System.out.println("in updateServiceType()");
service.updateServiceType(serviceTypeId, desc);
service.updateServiceType(serviceTypeId, serviceTypeDesc);
return new ApiResponse(ApiResponse.UPDATE_ACCESS_SUCESS).toResponse();
}
@ -54,7 +54,7 @@ public class ServiceTypeResource {
public Response createServiceType(ServiceTypeRequest request)
throws AstuteException {
System.out.println("in AstuteSyste createServiceType()");
service.createServiceType(request.getDesc());
service.createServiceType(request.getServiceTypeDesc());
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();
}
public void createServiceType(String desc) throws AstuteException {
getDao().createServiceType(desc);
public void createServiceType(String serviceTypeDesc) throws AstuteException {
getDao().createServiceType(serviceTypeDesc);
}
public void updateServiceType(int serviceTypeId, String desc) throws AstuteException {
getDao().updateServiceType(serviceTypeId, desc);
public void updateServiceType(int serviceTypeId, String serviceTypeDesc) throws AstuteException {
getDao().updateServiceType(serviceTypeId, serviceTypeDesc);
}
public void deleteServiceType(int serviceTypeId) throws AstuteException {