Merge branch 'PSMRI:develop' into develop

KpParth · Jun 18, 2024 · 0f2049b · 0f2049b
2 parents fe1750d + e224d5a
commit 0f2049b
Show file tree

Hide file tree

Showing 10 changed files with 43 additions and 36 deletions.
diff --git a/src/app/closure/closure.component.ts b/src/app/closure/closure.component.ts
@@ -631,6 +631,13 @@ export class ClosureComponent implements OnInit {
           this.beneficiaryDetails.benCallID !== undefined &&
           this.beneficiaryDetails.benCallID !== null)
       ) {
+        if (this.current_campaign == "OUTBOUND") {
+          values.IsOutbound = true;
+        }
+        else{
+          values.IsOutbound = false;
+        }
+
         if (this.saved_data.benCallID) {
           values.benCallID = this.saved_data.benCallID;
         } else {

diff --git a/src/app/services/callservices/callservice.service.ts b/src/app/services/callservices/callservice.service.ts
@@ -37,15 +37,15 @@ export class CallServices {
  // _baseUrl = this._config.get1097BaseURL();
   _commonURL = this._config.getCommonBaseURL();
   _104URL = this._config.get104BaseURL();
-  _storeCallIDURL = this._commonURL + "call/startCall/";
-  _closecallurl = this._commonURL + 'call/closeCall/';
+  _storeCallIDURL = this._commonURL + "call/startCall";
+  _closecallurl = this._commonURL + 'call/closeCall';
   //_callsummaryurl = this._baseUrl + 'services/getCallSummary/';
-  _calltypesurl = this._commonURL + 'call/getCallTypesV1/';
-  _isavailedurl = this._commonURL + 'call/isAvailed/';
+  _calltypesurl = this._commonURL + 'call/getCallTypesV1';
+  _isavailedurl = this._commonURL + 'call/isAvailed';
   _outboundCalls = this._commonURL + 'call/outboundCallList/';
-  _outbouncClose_url = this._commonURL + 'call/updateOutboundCall/';
-  _blacklistCalls = this._commonURL + 'call/getBlacklistNumbers/';
-  _blockPhoneNo = this._commonURL + 'call/blockPhoneNumber/';
+  _outbouncClose_url = this._commonURL + 'call/updateOutboundCall';
+  _blacklistCalls = this._commonURL + 'call/getBlacklistNumbers';
+  _blockPhoneNo = this._commonURL + 'call/blockPhoneNumber';
   _unblockPhoneNo = this._commonURL + 'call/unblockPhoneNumber';
   callTraversalHistory_URL = this._commonURL + 'call/getCallHistoryByCallID';
   _getRecording_url = this._commonURL + "call/nueisanceCallHistory";

diff --git a/src/app/services/coService/co_feedback.service.ts b/src/app/services/coService/co_feedback.service.ts
@@ -35,19 +35,19 @@ import { SecurityInterceptedHttp } from '../../http.securityinterceptor';
 export class CoFeedbackService {
 
     test = [];
-    // private _baseurl: string = "http://localhost:9090/helpline1097APIV1/"
+    // private _baseurl: string = "http://localhost:9090/helpline1097APIV1"
     private _baseurl: String = this._config.get1097BaseURL();
     private _commonBaseURL: String = this._config.getCommonBaseURL();
     private _104baseurl: String = this._config.get104BaseURL();
 
-    private _createFeedbackURL: string = this._104baseurl + "beneficiary/saveBenFeedback/"
+    private _createFeedbackURL: string = this._104baseurl + "beneficiary/saveBenFeedback"
     private _getDesignationsURL: string = this._commonBaseURL + "institute/getDesignations"
     private _getFeedbackHistoryByID: string = this._commonBaseURL + "feedback/getFeedbacksList"
     private getCategoryUrl: string = this._commonBaseURL + 'category/categories';
     private getSubCategoryUrl: string = this._commonBaseURL + 'service/subcategory';
-    private _createImrMmrURL: string = this._104baseurl + "beneficiary/saveIMRMMR/";
-    private _getIMRMMRWorklistURL: string = this._104baseurl + "beneficiary/getIMRMMRList/";
-    private _updateImrMmrURL: string = this._104baseurl + "/beneficiary/update/ImrMmrComplaint/";
+    private _createImrMmrURL: string = this._104baseurl + "beneficiary/saveIMRMMR";
+    private _getIMRMMRWorklistURL: string = this._104baseurl + "beneficiary/getIMRMMRList";
+    private _updateImrMmrURL: string = this._104baseurl + "/beneficiary/update/ImrMmrComplaint";
     constructor(private _http: SecurityInterceptedHttp, private _config: ConfigService, private _httpInterceptor: InterceptedHttp) { }
 
     createImrMmrURL(data: any) {

diff --git a/src/app/services/common/caller.service.ts b/src/app/services/common/caller.service.ts
@@ -34,7 +34,7 @@ import { InterceptedHttp } from './../../http.interceptor';
 export class CallerService {
     _104baseUrl = this._config.get104BaseURL();
     _commonBaseURL = this._config.getCommonBaseURL();
-    _storeCallIDURL = this._104baseUrl + "beneficiary/startCall/";
+    _storeCallIDURL = this._104baseUrl + "beneficiary/startCall";
     _setCallHistory = this._104baseUrl + "beneficiary/set/callHistory";
     _getBeneficiaryURL = this._commonBaseURL + "call/beneficiaryByCallID";
     //_getBeneficiaryURL =this._commonBaseURL + "beneficiary/call/getCallHistoryByCallID"; 

diff --git a/src/app/services/common/feedbacktypes.service.ts b/src/app/services/common/feedbacktypes.service.ts
@@ -33,12 +33,12 @@ import { SecurityInterceptedHttp } from '../../http.securityinterceptor';
 @Injectable()
 export class FeedbackTypes {
 
-    // _commonBaseURL = "http://localhost:9090/helpline1097APIV1/";
+    // _commonBaseURL = "http://localhost:9090/helpline1097APIV1";
     _helpline1097BaseURL = this._config.get1097BaseURL();
      _commonBaseURL = this._config.getCommonBaseURL();
      _helpline104BaseURL = this._config.get104BaseURL();
     _getFeedbackTypesURL = this._helpline104BaseURL + "beneficiary/get/natureOfComplaintTypes";
-    _getFeedbackSeverityURL = this._commonBaseURL + "feedback/getSeverity/";
+    _getFeedbackSeverityURL = this._commonBaseURL + "feedback/getSeverity";
 
 	getFeedbackIDTypes_url = this._commonBaseURL + "feedback/getFeedbackType";
 	getFeedbackLogsUrl = this._commonBaseURL + 'feedback/getFeedbackLogs';

diff --git a/src/app/services/common/location.service.ts b/src/app/services/common/location.service.ts
@@ -34,23 +34,23 @@ import { InterceptedHttp } from 'app/http.interceptor';
 @Injectable()
 export class LocationService
 {
-    // _commonBaseURL = "http://localhost:9090/CommonV1/";
+    // _commonBaseURL = "http://localhost:9090/CommonV1";
     _commonBaseURL = this._config.getCommonBaseURL();
     _104BaseURL = this._config.get104BaseURL();
     _getStateListURL = this._commonBaseURL + "location/states/";
     _getDistrictListURL = this._commonBaseURL + "location/districts/";
     _getTalukListURL = this._commonBaseURL + "location/taluks/";
     _getBlockListURL = this._commonBaseURL + "location/districtblocks/";
     _getBranchListURL = this._commonBaseURL + "location/village/";
-    _getInstituteListURL = this._commonBaseURL + 'institute/getInstituteTypes/';
-    _getDesignationListURL = this._commonBaseURL + "institute/getDesignationsByInstitute/";
-    _getDirectoriesListURL = this._commonBaseURL + "directory/getDirectory/";
-    _getSubDirectoriesListURL = this._commonBaseURL + "directory/getSubDirectory/";
-    _getCountryURL = this._104BaseURL + "/countryCityController/getCountry";
-    _getCityURL = this._104BaseURL + "/countryCityController/getCities/";
-    _getInstNameURL = this._commonBaseURL + "/institute/getInstituteNameByTypeAndDistrict/";
-    _getInstNameByIdURL = this._commonBaseURL + "/institute/getInstituteName/";
-    _getFaciltySupportServiceURL = this._104BaseURL + "/beneficiary/fetchimrmmrmasters";
+    _getInstituteListURL = this._commonBaseURL + 'institute/getInstituteTypes';
+    _getDesignationListURL = this._commonBaseURL + "institute/getDesignationsByInstitute";
+    _getDirectoriesListURL = this._commonBaseURL + "directory/getDirectory";
+    _getSubDirectoriesListURL = this._commonBaseURL + "directory/getSubDirectory";
+    _getCountryURL = this._104BaseURL + "countryCityController/getCountry";
+    _getCityURL = this._104BaseURL + "countryCityController/getCities";
+    _getInstNameURL = this._commonBaseURL + "institute/getInstituteNameByTypeAndDistrict/";
+    _getInstNameByIdURL = this._commonBaseURL + "institute/getInstituteName/";
+    _getFaciltySupportServiceURL = this._104BaseURL + "beneficiary/fetchimrmmrmasters";
     _getGovtIDURL = this._commonBaseURL + "beneficiary/getRegistrationDataV1";
 
 

diff --git a/src/app/services/common/userbeneficiarydata.service.ts b/src/app/services/common/userbeneficiarydata.service.ts
@@ -32,10 +32,10 @@ import { SecurityInterceptedHttp } from '../../http.securityinterceptor';
 @Injectable()
 export class UserBeneficiaryData
 {
-    // _commonBaseURL = "http://localhost:9090/CommonV1/";
+    // _commonBaseURL = "http://localhost:9090/CommonV1";
     _commonBaseURL = this._config.getCommonBaseURL();
     _104BaseURL = this._config.get104BaseURL();
-    _getUserBeneficaryDataURL = this._commonBaseURL + "beneficiary/getRegistrationDataV1/";
+    _getUserBeneficaryDataURL = this._commonBaseURL + "beneficiary/getRegistrationDataV1";
     _storeAltNumberURL =  this._104BaseURL + "beneficiary/save/BeneficiaryPhoneNumber";
     headers = new Headers( { 'Content-Type': 'application/json' } );
     options = new RequestOptions( { headers: this.headers } );

diff --git a/src/app/services/searchBeneficiaryService/search.service.ts b/src/app/services/searchBeneficiaryService/search.service.ts
@@ -36,14 +36,14 @@ export class SearchService {
     _commonBaseUrl = this._config.getCommonBaseURL();
     _104BaseUrl = this._config.get104BaseURL();
     responseData: any;
-    _getuserdata = "beneficiary/searchUserByID/";
-    _updatebeneficiaryurl = "beneficiary/update/";
+    _getuserdata = "beneficiary/searchUserByID";
+    _updatebeneficiaryurl = "beneficiary/update";
     _getuserdatabyno: any;
     _searchBeneficiaryURL: any;
     _fhirBaseUrl =this._config.getFHIRBaseURL();
     _updatebeneficiaryincall = this._commonBaseUrl + 'call/updatebeneficiaryincall';
-    updateOtherURL = '/beneficiary/updateCommunityorEducation';
-    _getHealthIdURL = '/healthID/getBenhealthID'
+    updateOtherURL = 'beneficiary/updateCommunityorEducation';
+    _getHealthIdURL = 'healthID/getBenhealthID'
 
     /*Edited by: Diamond Khanna, Date:28,september,2017*/
     getStates_url: any;
@@ -55,17 +55,17 @@ export class SearchService {
     /*end*/
 
     constructor(private _http: SecurityInterceptedHttp, private _config: ConfigService, private httpIntercept: InterceptedHttp) {
-        this._getuserdatabyno = this._commonBaseUrl + 'beneficiary/searchUserByPhone/';
+        this._getuserdatabyno = this._commonBaseUrl + 'beneficiary/searchUserByPhone';
         this._searchBeneficiaryURL = this._commonBaseUrl + "beneficiary/searchBeneficiary";
 
         /*Edited by: Diamond Khanna, Date:28,september,2017*/
         this.getStates_url = this._adminUrl + "m/role/state";
-        this.getDistricts_url = this._104BaseUrl + "location/districts/";
+        this.getDistricts_url = this._104BaseUrl + "location/districts";
         this.getSubDistricts_url = this._commonBaseUrl + "location/taluks/";
         this.getVillages_url = this._commonBaseUrl + "location/village/";
         this.createBenURL = this._commonBaseUrl + "beneficiary/create";
         /*end*/
-        this.getFacilityMaster_url = this._commonBaseUrl + "uptsu/get/facilityMaster/";
+        this.getFacilityMaster_url = this._commonBaseUrl + "uptsu/get/facilityMaster";
         this.getSaveAppointment_url = this._commonBaseUrl + "uptsu/save/appointment-details";
     }
     createBenURL: any;

diff --git a/src/app/services/snomedService/snomed-service.service.ts b/src/app/services/snomedService/snomed-service.service.ts
@@ -34,7 +34,7 @@ export class SnomedService {
 	constructor(private http: SecurityInterceptedHttp, private _config: ConfigService) { }
 
 	getSnomedCTRecord(term) {
-		return this.http.post(this._104baseUrl + "snomed/getSnomedCTRecord/", { "term": term }).map(this.extractData).catch(this.handleError);
+		return this.http.post(this._104baseUrl + "snomed/getSnomedCTRecord", { "term": term }).map(this.extractData).catch(this.handleError);
 	}
 
 	private extractData(response: Response) {

diff --git a/src/app/services/supervisorServices/quality-audit-service.service.ts b/src/app/services/supervisorServices/quality-audit-service.service.ts
@@ -70,7 +70,7 @@ export class QualityAuditService {
         this.getServicesUrl = this.admin_Base_Url + 'm/role/serviceNew';
         this.getRolesUrl = this.commonBaseURL + 'user/getRolesByProviderID';
         this.getServiceProviderID_url = this.admin_Base_Url + 'getServiceProviderid';
-        this._calltypesurl = this.commonBaseURL + 'call/getCallTypesV1/';
+        this._calltypesurl = this.commonBaseURL + 'call/getCallTypesV1';
         this.filterCallListUrl = this.commonBaseURL + 'call/filterCallList';
         // this.getCallSummaryUrl = this._104baseUrl + 'services/getCaseSheet';
         // this.getAllAgents_Url = this.admin_Base_Url + 'getAllAgentIds';