Skip to content
This repository has been archived by the owner on Jul 1, 2024. It is now read-only.

Commit

Permalink
Merge pull request #91 from devikasuresh20/develop
Browse files Browse the repository at this point in the history 
Added correct URL for IOT
  • Loading branch information
@ravishanigarapu
ravishanigarapu authored Jun 14, 2024
2 parents a0c1e03 + ee68384 commit 1a7e21e
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 24 deletions.
1 change: 1 addition & 0 deletions scripts/ci-prebuild.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ const defaultEnvValues = {
SCHEDULER_API_BASE: '',
ADMIN_API_BASE: '',
FHIR_API_BASE: '',
EZDX_HUB_BASE: '',
SERVER_IP: '',
SWYMED_IP: '',
SCHEDULER_UI_BASE: '',
Expand Down
13 changes: 7 additions & 6 deletions src/environments/environment.ci.ts.template
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,10 @@ const SCHEDULER_API = '<%= SCHEDULER_API_BASE %>';
const mmuUICasesheet = '<%= TM_API_BASE %>';
const ADMIN_API = '<%= ADMIN_API_BASE %>';
const FHIR_API = '<%= FHIR_API_BASE %>';
const IOT_API = '<%= EZDX_HUB_BASE %>';
const INVENTORY_UI = '<%= INVENTORY_UI_BASE %>';
const SCHEDULER_UI = '<%= SCHEDULER_UI_BASE %>';
const biologicalScreeningDeviceAPI = `${ADMIN_API}/diagnostics/biologicalScreeningDevice`;


export const environment = {
production: true,
Expand Down Expand Up @@ -353,11 +354,11 @@ export const environment = {
apiVersionUrl: `${TM_API}version`,
snomedCTRecordListURL1: `${COMMON_API}snomed/getSnomedCTRecordList`,

ioturl: `${biologicalScreeningDeviceAPI}`,
deviceStatusurl: `${biologicalScreeningDeviceAPI}/api/v1/bluetooth/hub/connection_status`,
deviceDisconnectUrl: `${biologicalScreeningDeviceAPI}/api/v1/bluetooth/hub/disconnect`,
deviceBluetoothurl: `${biologicalScreeningDeviceAPI}/api/v1/bluetooth/service_discovery`,
connectdeviceBluetoothurl: `${biologicalScreeningDeviceAPI}/api/v1/bluetooth/hub_connection`,
ioturl: `${IOT_API}`,
deviceStatusurl: `${IOT_API}/api/v1/bluetooth/hub/connection_status`,
deviceDisconnectUrl: `${IOT_API}/api/v1/bluetooth/hub/disconnect`,
deviceBluetoothurl: `${IOT_API}/api/v1/bluetooth/service_discovery`,
connectdeviceBluetoothurl: `${IOT_API}/api/v1/bluetooth/hub_connection`,

startWeighturl: "/api/v1/physical_tests/weight",
startTempurl: "/api/v1/physical_tests/temperature",
Expand Down
12 changes: 6 additions & 6 deletions src/environments/environment.prod.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@ const COMMON_API_OPEN_SYNC = `${SERVER_IP}commonapi-v1.0/`;
const SCHEDULER_API = `${schedulerIP}schedulerapi-v1.0/`;
const ADMIN_API = `${adminIP}/adminapi-v1.0`;
const API104 = `${IP104}/104api-v1.0/`;
const biologicalScreeningDeviceAPI = `${ADMIN_API}/diagnostics/biologicalScreeningDevice`;
const FHIR_API = `${FHIRIP}/fhirapi-v1.0/`;
const IOT_API = 'http://localhost:8085/ezdx-hub-connect-srv'
const mmuUICasesheet = `${tmUI_IP}tmui-v1.0`;

export const environment = {
Expand Down Expand Up @@ -375,11 +375,11 @@ export const environment = {
apiVersionUrl: `${TM_API}version`,
snomedCTRecordListURL1: `${COMMON_API}snomed/getSnomedCTRecordList`,

ioturl: `${biologicalScreeningDeviceAPI}`,
deviceStatusurl: `${biologicalScreeningDeviceAPI}/api/v1/bluetooth/hub/connection_status`,
deviceDisconnectUrl: `${biologicalScreeningDeviceAPI}/api/v1/bluetooth/hub/disconnect`,
deviceBluetoothurl: `${biologicalScreeningDeviceAPI}/api/v1/bluetooth/service_discovery`,
connectdeviceBluetoothurl: `${biologicalScreeningDeviceAPI}/api/v1/bluetooth/hub_connection`,
ioturl: `${IOT_API}`,
deviceStatusurl: `${IOT_API}/api/v1/bluetooth/hub/connection_status`,
deviceDisconnectUrl: `${IOT_API}/api/v1/bluetooth/hub/disconnect`,
deviceBluetoothurl: `${IOT_API}/api/v1/bluetooth/service_discovery`,
connectdeviceBluetoothurl: `${IOT_API}/api/v1/bluetooth/hub_connection`,

startWeighturl: "/api/v1/physical_tests/weight",
startTempurl: "/api/v1/physical_tests/temperature",
Expand Down
12 changes: 6 additions & 6 deletions src/environments/environment.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ const SERVER_IP = 'dataSYNCIP';
const SWYMED_IP = '14.143.13.109';
const adminIP = "http://10.208.122.38:8080";
const FHIRIP = "http://10.208.122.38:8080";
const IOT_API = 'http://localhost:8085/ezdx-hub-connect-srv'
const identityIP = 'http://10.208.122.38:8080/';
const IDENTITY_API = `${identityIP}/hwc-identity-0.0.1/`;
const IP104 = 'http://10.208.122.38:8080/';
Expand All @@ -54,7 +55,6 @@ const COMMON_API_OPEN_SYNC = `${SERVER_IP}commonapi-v1.0/`;
const SCHEDULER_API = `${schedulerIP}schedulerapi-v1.0/`;
const ADMIN_API = `${adminIP}/adminapi-v1.0`;
const API104 = `${IP104}/104api-v1.0/`;
const biologicalScreeningDeviceAPI = `${ADMIN_API}/diagnostics/biologicalScreeningDevice`;
const FHIR_API = `${FHIRIP}/fhirapi-v1.0/`;
const mmuUICasesheet = `${tmUI_IP}tmui-v1.0`;

Expand Down Expand Up @@ -382,11 +382,11 @@ export const environment = {
apiVersionUrl: `${TM_API}version`,
snomedCTRecordListURL1: `${COMMON_API}snomed/getSnomedCTRecordList`,

ioturl: `${biologicalScreeningDeviceAPI}`,
deviceStatusurl:`${biologicalScreeningDeviceAPI}/api/v1/bluetooth/hub/connection_status`,
deviceDisconnectUrl:`${biologicalScreeningDeviceAPI}/api/v1/bluetooth/hub/disconnect`,
deviceBluetoothurl:`${biologicalScreeningDeviceAPI}/api/v1/bluetooth/service_discovery`,
connectdeviceBluetoothurl:`${biologicalScreeningDeviceAPI}/api/v1/bluetooth/hub_connection`,
ioturl: `${IOT_API}`,
deviceStatusurl:`${IOT_API}/api/v1/bluetooth/hub/connection_status`,
deviceDisconnectUrl:`${IOT_API}/api/v1/bluetooth/hub/disconnect`,
deviceBluetoothurl:`${IOT_API}/api/v1/bluetooth/service_discovery`,
connectdeviceBluetoothurl:`${IOT_API}/api/v1/bluetooth/hub_connection`,

startWeighturl: "/api/v1/physical_tests/weight",
startTempurl: "/api/v1/physical_tests/temperature",
Expand Down
12 changes: 6 additions & 6 deletions src/environments/environment.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ const mmuIP = 'http://10.208.122.100:8080/';
const schedulerIP = 'http://10.208.122.100:8080/';
const adminIP = 'http://10.208.122.100:8080/';
const FHIRIP ='http://10.208.122.100:8080/';
const IOT_API = 'http://localhost:8085/ezdx-hub-connect-srv'
const SERVER_IP = "10.208.122.39";
const SWYMED_IP = "14.143.13.109";

Expand Down Expand Up @@ -62,7 +63,6 @@ const mmuUICasesheet = "http://localhost:4200/";
const ADMIN_API = `${adminIP}/adminapi-v1.0`;
var inventoryUI_IP = 'https://amritwprdev.piramalswasthya.org/';

const biologicalScreeningDeviceAPI = `${ADMIN_API}/diagnostics/biologicalScreeningDevice`;

const FHIR_API = `${FHIRIP}/fhirapi-v1.0/`;

Expand Down Expand Up @@ -393,11 +393,11 @@ export const environment = {
//file upload
saveFile: `${COMMON_API}kmfilemanager/addFile`,
viewFileData: `${TM_API}common/getKMFile`,
ioturl: `${biologicalScreeningDeviceAPI}`,
deviceStatusurl: `${biologicalScreeningDeviceAPI}/api/v1/bluetooth/hub/connection_status`,
deviceDisconnectUrl:`${biologicalScreeningDeviceAPI}/api/v1/bluetooth/hub/disconnect`,
deviceBluetoothurl: `${biologicalScreeningDeviceAPI}/api/v1/bluetooth/service_discovery`,
connectdeviceBluetoothurl: `${biologicalScreeningDeviceAPI}/api/v1/bluetooth/hub_connection`,
ioturl: `${IOT_API}`,
deviceStatusurl: `${IOT_API}/api/v1/bluetooth/hub/connection_status`,
deviceDisconnectUrl:`${IOT_API}/api/v1/bluetooth/hub/disconnect`,
deviceBluetoothurl: `${IOT_API}/api/v1/bluetooth/service_discovery`,
connectdeviceBluetoothurl: `${IOT_API}/api/v1/bluetooth/hub_connection`,

startWeighturl: "/api/v1/physical_tests/weight",
startTempurl: "/api/v1/physical_tests/temperature",
Expand Down

0 comments on commit 1a7e21e

Please sign in to comment.