Merge remote-tracking branch 'origin/main'
# Conflicts: # app/src/main/java/de/labor_stein/befund/Core/Https/Servers.java
This commit is contained in:
commit
cedcc4f078
|
@ -10,12 +10,13 @@ package de.labor_stein.befund.Core.Https;
|
||||||
public enum Servers
|
public enum Servers
|
||||||
{
|
{
|
||||||
// Development server change ip to your local ip
|
// Development server change ip to your local ip
|
||||||
DEVELOPMENT("127.0.0.1"),
|
DEVELOPMENT("patientenbefundapp.labor-muenster.de"),
|
||||||
|
//DEVELOPMENT("172.21.200.145"),
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* HOST´s of productive outside services
|
* HOST´s of productive outside services
|
||||||
*/
|
*/
|
||||||
LIS_SIMULATOR("10.200.200.102"),
|
LIS_SIMULATOR("pba-simulator.patientenbefundapp.labor-limbach-hannover.de:8443"),
|
||||||
LABOR_HEIDELBERG("patientenbefundapp.labor-limbach.de"),
|
LABOR_HEIDELBERG("patientenbefundapp.labor-limbach.de"),
|
||||||
LABOR_LUDWIGSBURG("patientenbefundapp.mvz-labor-lb.de"),
|
LABOR_LUDWIGSBURG("patientenbefundapp.mvz-labor-lb.de"),
|
||||||
LABOR_ULM("patientenbefundapp.humangenetik-ulm.de"),
|
LABOR_ULM("patientenbefundapp.humangenetik-ulm.de"),
|
||||||
|
|
|
@ -85,7 +85,7 @@ public class Settings
|
||||||
result.labor = Labor.GetLaborByName(labor_id);
|
result.labor = Labor.GetLaborByName(labor_id);
|
||||||
|
|
||||||
/** REMOVE FOR PRODUCTIVE **/
|
/** REMOVE FOR PRODUCTIVE **/
|
||||||
//result.labor.host = Servers.DEVELOPMENT;
|
result.labor.host = Servers.DEVELOPMENT;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -22,7 +22,7 @@
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:textSize="40dp"
|
android:textSize="40dp"
|
||||||
android:text="@string/app_name"
|
android:text=""
|
||||||
android:layout_marginBottom="50dp"
|
android:layout_marginBottom="50dp"
|
||||||
android:textColor="@color/primary_color"
|
android:textColor="@color/primary_color"
|
||||||
android:textAlignment="center" >
|
android:textAlignment="center" >
|
||||||
|
|
|
@ -11,7 +11,7 @@
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:textSize="40dp"
|
android:textSize="40dp"
|
||||||
android:text="@string/app_name"
|
android:text=""
|
||||||
android:textColor="@color/primary_color"
|
android:textColor="@color/primary_color"
|
||||||
android:textAlignment="center"
|
android:textAlignment="center"
|
||||||
android:layout_marginTop="-150dp"
|
android:layout_marginTop="-150dp"
|
||||||
|
|
Loading…
Reference in New Issue