Merge pull request #22 from PSMRI/develop

develop to master
PSMRI · May 20, 2024 · 3a5ffbf · 3a5ffbf
2 parents f0ad8b4 + 3140248
commit 3a5ffbf
Show file tree

Hide file tree

Showing 14 changed files with 46 additions and 40 deletions.
diff --git a/src/app/closure/closure.component.ts b/src/app/closure/closure.component.ts
@@ -527,10 +527,13 @@ export class ClosureComponent implements OnInit {
     if (btnType === "submitClose") {
       values.endCall = true;
     }
-    if (this.current_campaign === "OUTBOUND") {
-      values.isCompleted = true;
-    }
     console.log("close called with " + values);
+    if (this.current_campaign == "OUTBOUND") {
+      values.IsOutbound = true;
+    }
+    else{
+      values.IsOutbound = false;
+    }
     if (
       this.current_campaign !== undefined &&
       this.current_campaign !== null &&

diff --git a/src/app/co-referral-services/co-referral-services.component.ts b/src/app/co-referral-services/co-referral-services.component.ts
@@ -324,7 +324,10 @@ export class CoReferralServicesComponent implements OnInit {
     });
 
     dialogReff.afterClosed().subscribe(result => {
-      if (result) {
+      if(result === 'close'){
+        // do nothing
+      }
+      else if(result) {
         // this.message.alert('Message sent to alternate number', 'success');
         this.send_sms(this.ref_array, result)
       }

diff --git a/src/app/services/callservices/callservice.service.ts b/src/app/services/callservices/callservice.service.ts
@@ -34,27 +34,27 @@ import { AuthorizationWrapper } from './../../authorization.wrapper';
 export class CallServices {
   _baseUrl = this._config.get1097BaseURL();
   _commonURL = this._config.getCommonBaseURL();
-  _closecallurl = this._commonURL + 'call/closeCall/';
-  _callsummaryurl = this._baseUrl + 'services/getCallSummary/';
-  _calltypesurl = this._commonURL + 'call/getCallTypesV1/';
-  _outboundCalls = this._commonURL + 'call/outboundCallList/';
-  _blacklistCalls = this._commonURL + 'call/getBlacklistNumbers/';
-  _blockPhoneNo = this._commonURL + 'call/blockPhoneNumber/';
-  _unblockPhoneNo = this._commonURL + 'call/unblockPhoneNumber/';
-  _outbouncClose_url = this._commonURL + 'call/completeOutboundCall/';
-  _getLanguage_url = this._commonURL + 'beneficiary/getLanguageList/';
-  _disconnectCall_url = this._commonURL + 'cti/disconnectCall/';
-  _switchToInbound_url = this._commonURL + 'cti/switchToInbound/'
-  _getRecording_url = this._commonURL + 'call/nueisanceCallHistory/';
-  _switchToOutbound_url = this._commonURL + 'cti/switchToOutbound/';
+  _closecallurl = this._commonURL + 'call/closeCall';
+  _callsummaryurl = this._baseUrl + 'services/getCallSummary';
+  _calltypesurl = this._commonURL + 'call/getCallTypesV1';
+  _outboundCalls = this._commonURL + 'call/outboundCallList';
+  _blacklistCalls = this._commonURL + 'call/getBlacklistNumbers';
+  _blockPhoneNo = this._commonURL + 'call/blockPhoneNumber';
+  _unblockPhoneNo = this._commonURL + 'call/unblockPhoneNumber';
+  _outbouncClose_url = this._commonURL + 'call/completeOutboundCall';
+  _getLanguage_url = this._commonURL + 'beneficiary/getLanguageList';
+  _disconnectCall_url = this._commonURL + 'cti/disconnectCall';
+  _switchToInbound_url = this._commonURL + 'cti/switchToInbound'
+  _getRecording_url = this._commonURL + 'call/nueisanceCallHistory';
+  _switchToOutbound_url = this._commonURL + 'cti/switchToOutbound';
   _getCampaignNames_url = this._commonURL + 'cti/getCampaignNames';
   _getCampaignSkills_url = this._commonURL + 'cti/getCampaignSkills';
   _transferCall_url = this._commonURL + 'cti/transferCall';
   _getBeneficiaryURL = this._commonURL + "call/beneficiaryByCallID";
   _getBenOutboundListUrl = this._commonURL + "call/getBenRequestedOutboundCall";
   _servicetypesurl = this._commonURL + "service/servicetypes";
-  _outEverwellbouncClose_url = this._commonURL + 'everwellCall/completeOutboundCall/';
-  _postEverwellFeedback = this._commonURL + 'everwellCall/saveFeedback/';
+  _outEverwellbouncClose_url = this._commonURL + 'everwellCall/completeOutboundCall';
+  _postEverwellFeedback = this._commonURL + 'everwellCall/saveFeedback';
   getWrapupTime = this._commonURL +  'user/role/';
   onceOutbound: boolean = false;
   _everwellCheckAlreadyCalled = this._commonURL + 'everwellCall/checkIfAlreadyCalled';

diff --git a/src/app/services/coService/co_feedback.service.ts b/src/app/services/coService/co_feedback.service.ts
@@ -39,8 +39,8 @@ export class CoFeedbackService {
     _commonUrl = this._config.getCommonBaseURL();
     _servicetypesurl = this._commonUrl + 'service/servicetypes';
     // _servicetypesurl = this._baseurl + 'api/helpline1097/co/get/servicetypes'
-    _createFeedbackURL = this._baseurl + 'co/saveBenFeedback/'
-    _getDesignationsURL = this._baseurl + 'designation/get/'
+    _createFeedbackURL = this._baseurl + 'co/saveBenFeedback'
+    _getDesignationsURL = this._baseurl + 'designation/get'
     // _getFeedbackHistoryByID = this._baseurl + 'services/getFeedbacksHistory'
     _getFeedbackHistory = this._commonUrl + 'feedback/getFeedbacksList';
     constructor(

diff --git a/src/app/services/common/feedbacktypes.service.ts b/src/app/services/common/feedbacktypes.service.ts
@@ -39,7 +39,7 @@ export class FeedbackTypes {
     _getFeedbackTypesURL = this._commonURL + 'feedback/getFeedbackType';
     // _getFeedbackSeverityURL = this._commonURL + "feedback/getSeverity";
     // _getFeedbackTypesURL = this._helpline104BaseURL + "beneficiary/get/natureOfComplaintTypes";
-    _getFeedbackSeverityURL = this._commonURL + 'feedback/getSeverity/';
+    _getFeedbackSeverityURL = this._commonURL + 'feedback/getSeverity';
 
     getFeedbackIDTypes_url = this._commonURL + 'feedback/getFeedbackType';
     constructor(

diff --git a/src/app/services/common/location.service.ts b/src/app/services/common/location.service.ts
@@ -39,10 +39,10 @@ export class LocationService {
     _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/getDirectoryV1/';
-    _getSubDirectoriesListURL = this._commonBaseURL + 'directory/getSubDirectory/';
+    _getInstituteListURL = this._commonBaseURL + 'institute/getInstituteTypes';
+    _getDesignationListURL = this._commonBaseURL + 'institute/getDesignationsByInstitute';
+    _getDirectoriesListURL = this._commonBaseURL + 'directory/getDirectoryV1';
+    _getSubDirectoriesListURL = this._commonBaseURL + 'directory/getSubDirectory';
     constructor(
         private _http: AuthorizationWrapper,
         private _config: ConfigService

diff --git a/src/app/services/common/userbeneficiarydata.service.ts b/src/app/services/common/userbeneficiarydata.service.ts
@@ -35,7 +35,7 @@ import { AuthorizationWrapper } from './../../authorization.wrapper';
 @Injectable()
 export class UserBeneficiaryData {
     _commonBaseURL = this._config.getCommonBaseURL();
-    _getUserBeneficaryDataURL = this._commonBaseURL + 'beneficiary/getRegistrationDataV1/';
+    _getUserBeneficaryDataURL = this._commonBaseURL + 'beneficiary/getRegistrationDataV1';
     _searchBeneficiary = this._commonBaseURL + 'beneficiary/searchBeneficiary';
     constructor(
         private _http: AuthorizationWrapper,

diff --git a/src/app/services/loginService/login.service.ts b/src/app/services/loginService/login.service.ts
@@ -37,10 +37,10 @@ export class loginService {
   _baseURL = this._config.getCommonBaseURL();
   admin = this._config.getAdminBaseUrl();
   base1097URL = this._config.get1097BaseURL();
-  _userAuthURL = this.openBaseUrl + 'user/userAuthenticate/';
+  _userAuthURL = this.openBaseUrl + 'user/userAuthenticate';
   _userLogoutPreviousSessionURL = this.openBaseUrl + 'user/logOutUserFromConcurrentSession';
-  _forgotPasswordURL = this.openBaseUrl + 'user/forgetPassword/';
-  _getDetailsByID = this._baseURL + 'user/getUserDetails/';
+  _forgotPasswordURL = this.openBaseUrl + 'user/forgetPassword';
+  _getDetailsByID = this._baseURL + 'user/getUserDetails';
   _validateQuestionAndAnswers = this._baseURL + 'user/validateSecurityQuestionAndAnswer';
   _authorisedUser = this.openBaseUrl + 'user/getLoginResponse';
   apiVersionUrl = this.base1097URL + "version";

diff --git a/src/app/services/outboundServices/outbound-call-reallocation.service.ts b/src/app/services/outboundServices/outbound-call-reallocation.service.ts
@@ -43,7 +43,7 @@ export class OutboundReAllocationService {
     private moveToBinURL: string = this._baseurl + 'call/resetOutboundCall';
     private everwellMoveToBinURL: string = this._baseurl + 'everwellCall/resetOutboundCall';    
     private _getEverwelloutboundCallListURL: string = this._baseurl + 'everwellCall/outboundCallList';
-    private getEverwellFeedBackDetailsURL: string = this._baseurl + '/everwellCall/getEverwellfeedbackDetails';
+    private getEverwellFeedBackDetailsURL: string = this._baseurl + 'everwellCall/getEverwellfeedbackDetails';
     private getEverwellGuidelinesURL: string = this._1097baseUrl + 'fetchEverwellGuidelines';
     private getbenDetailsOnPhnNoURL: string = this._baseurl + 'everwellCall/outboundCallListWithMobileNumber';
     constructor(private _http: AuthorizationWrapper, private _config: ConfigService) {

diff --git a/src/app/services/register-services/register-service.ts b/src/app/services/register-services/register-service.ts
@@ -34,11 +34,11 @@ import { InterceptedHttp } from './../../http.interceptor';
 export class RegisterService {
   _baseUrl = this._config.getCommonBaseURL();
   _helplineURL = this._config.get1097BaseURL();
-  _createbeneficiaryurl = this._baseUrl + 'beneficiary/create/';
-  _getrelationshipurl = this._baseUrl + 'get/beneficiaryRelationship/';
-  _getuserdata = this._baseUrl + 'beneficiary/searchUserByID/';
-  _getuserdatabyno = this._baseUrl + 'beneficiary/searchUserByPhone/';
-  _startCall = this._baseUrl + 'call/startCall/';
+  _createbeneficiaryurl = this._baseUrl + 'beneficiary/create';
+  _getrelationshipurl = this._baseUrl + 'get/beneficiaryRelationship';
+  _getuserdata = this._baseUrl + 'beneficiary/searchUserByID';
+  _getuserdatabyno = this._baseUrl + 'beneficiary/searchUserByPhone';
+  _startCall = this._baseUrl + 'call/startCall';
   _updatebeneficiaryincall = this._baseUrl + 'call/updatebeneficiaryincall';
   _getregistrationdata = this._baseUrl + 'beneficiary/getRegistrationDataV1';
   _searchBeneficiaryURL = this._baseUrl + 'beneficiary/searchBeneficiary';

diff --git a/src/app/services/supervisorServices/quality-audit-service.service.ts b/src/app/services/supervisorServices/quality-audit-service.service.ts
@@ -56,7 +56,7 @@ export class QualityAuditService {
         this.getServicesUrl = this.admin_Base_Url + 'm/role/serviceNew';
         this.getRolesUrl = this.admin_Base_Url + 'm/role/search';
         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._1097baseUrl + 'services/getCaseSheet';
         this.getAllAgents_Url = this.admin_Base_Url + 'getAllAgentIds';

diff --git a/src/app/services/update-services/update-service.ts b/src/app/services/update-services/update-service.ts
@@ -34,7 +34,7 @@ export class UpdateService {
   options = new RequestOptions({ headers: this.headers });
 
   _baseUrl = this._config.getCommonBaseURL();
-  _updatebeneficiaryurl = this._baseUrl + 'beneficiary/update/';
+  _updatebeneficiaryurl = this._baseUrl + 'beneficiary/update';
   constructor(
     private _http: Http,
     private _config: ConfigService,

diff --git a/src/app/supervisor-grievance/grievance.component.ts b/src/app/supervisor-grievance/grievance.component.ts
@@ -356,7 +356,7 @@ export class grievanceComponent implements OnInit {
         feedback.feedbackRequests[feedback.feedbackRequests.length - 1].feedbackSupSummary : feedback.feedback
     );
     // this.feedbackForm.controls.feedbackSupSummary.setValue(feedback.feedback);
-    this.feedbackForm.controls.beneficiaryName.setValue(feedback.mUser.firstName + " " + (feedback.mUser.lastName ? feedback.mUser.lastName : ""));
+    this.feedbackForm.controls.beneficiaryName.setValue(feedback.muser.firstName + " " + (feedback.muser.lastName ? feedback.muser.lastName : ""));
     // this.feedbackForm.controls.createdDate.setValue(feedback.CreatedDate);
     this.feedbackForm.controls.feedbackDate.setValue(new Date(feedback.createdDate).toLocaleDateString('en-in'));
     this.feedbackForm.controls.feedbackTypeName.setValue(feedback.feedbackType.feedbackTypeName);

diff --git a/src/app/supervisor-training-resources/supervisor-training-resources.component.ts b/src/app/supervisor-training-resources/supervisor-training-resources.component.ts
@@ -542,7 +542,7 @@ else{
     this.error2 = false;
     this.invalid_file_flag = false;
     this.invalidFileNameFlag=false;
-    this.file = undefined;
+    // this.file = undefined;
     if (this.file && this.fileContent) {
       editedObj = {
         'providerServiceMapID': this.providerServiceMapID,