Merge branch 'MOE_DEV_NEW_TEMPORARY_DESIGN' of https://gitlab.com/haroon6138/mohemmionic5 into MOE_DEV_NEW_TEMPORARY_DESIGN

# Conflicts:
#	Mohem/src/app/hmg-common/services/connector/connector.service.ts
MOE_DEV_NEW_TEMPORARY_DESIGN
Sultan Khan 3 years ago
commit 6017e245e4

@ -27,10 +27,10 @@ export class ConnectorService {
public static retryTimes = 0;
public static timeOut = 180 * 1000;
public static host = 'https://uat.hmgwebservices.com/';
//public static host = 'https://uat.hmgwebservices.com/';
// public static host = 'https://hmgwebservices.com/';
// public static host = 'http://riyt-mohemm1.mopm.gov.sa:1010/' // MOE vpn
// public static host = 'https://hrmsys.moenergy.gov.sa/'
//public static host = 'http://10.0.50.241:1010/' // MOE vpn
public static host = 'https://hrmsys.moenergy.gov.sa/'

@ -81,7 +81,7 @@ ion-label {
width: 100%;
margin-top: 25px;
margin-bottom: 0px;
margin-right: 10px !important;
// margin-right: 10px !important;
margin-left: 10px !important;
h3 {

Loading…
Cancel
Save