From a3bfd6faed0037645e6a0589d154d23ce20de126 Mon Sep 17 00:00:00 2001 From: Artur Savitskiy Date: Mon, 10 Jun 2024 16:24:11 +0200 Subject: [PATCH] changes in Labors --- Befund.xcodeproj/project.pbxproj | 4 ++-- Befund/Core/Https/Servers.swift | 4 ++-- Befund/Core/Models/Labor.swift | 31 +++++++++---------------------- 3 files changed, 13 insertions(+), 26 deletions(-) diff --git a/Befund.xcodeproj/project.pbxproj b/Befund.xcodeproj/project.pbxproj index 5589743..58bf270 100644 --- a/Befund.xcodeproj/project.pbxproj +++ b/Befund.xcodeproj/project.pbxproj @@ -928,7 +928,7 @@ CODE_SIGN_IDENTITY = "Apple Development: Artur Savitskiy (J576JNSQ97)"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Distribution: Limetec Biotechnologies GmbH (W86CN3N7WD)"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 2; + CURRENT_PROJECT_VERSION = 3; DEVELOPMENT_TEAM = W86CN3N7WD; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = W86CN3N7WD; GENERATE_INFOPLIST_FILE = YES; @@ -969,7 +969,7 @@ CODE_SIGN_IDENTITY = "Apple Development: Artur Savitskiy (J576JNSQ97)"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Distribution: Limetec Biotechnologies GmbH (W86CN3N7WD)"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 2; + CURRENT_PROJECT_VERSION = 3; DEVELOPMENT_TEAM = W86CN3N7WD; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = W86CN3N7WD; GENERATE_INFOPLIST_FILE = YES; diff --git a/Befund/Core/Https/Servers.swift b/Befund/Core/Https/Servers.swift index 258bf56..a850fb2 100644 --- a/Befund/Core/Https/Servers.swift +++ b/Befund/Core/Https/Servers.swift @@ -18,7 +18,7 @@ extension Core.Https /** * HOST´s of productive outside services */ - case LIS_SIMULATOR = "10.200.200.102" + case LIS_SIMULATOR = "labaccess.de:8443" case LABOR_HEIDELBERG = "patientenbefundapp.labor-limbach.de" case LABOR_LUDWIGSBURG = "patientenbefundapp.mvz-labor-lb.de" case LABOR_ULM = "patientenbefundapp.humangenetik-ulm.de" @@ -32,7 +32,7 @@ extension Core.Https case LABOR_ESSEN = "patientenbefundapp.labor-eveld.de" case LABOR_FREIBURG = "patientenbefundapp.mvz-clotten.de" case LABOR_HANNOVER = "patientenbefundapp.labor-limbach-hannover.de" - case LABOR_HOFHEIM = "patientenbefundapp.labor-hofheim.de" + //case LABOR_HOFHEIM = "patientenbefundapp.labor-hofheim.de" case LABOR_KARLSRUHE = "patientenbefundapp.laborvolkmann.de" case LABOR_LEIPZIG = "patientenbefundapp.labor-leipzig.de" case LABOR_MOENCHENGLADBACH = "patientenbefundapp.labor-stein.de" diff --git a/Befund/Core/Models/Labor.swift b/Befund/Core/Models/Labor.swift index 1c1bb25..a4e331c 100644 --- a/Befund/Core/Models/Labor.swift +++ b/Befund/Core/Models/Labor.swift @@ -71,7 +71,7 @@ extension Core.Models /** MVZ Labor Dr. Limbach & Kollegen GbR **/ let labor_heidelberg = Labor() labor_heidelberg.id = "LABOR_HEIDELBERG"; - labor_heidelberg.name = "MVZ Labor Dr. Limbach & Kollegen GbR"; + labor_heidelberg.name = "MVZ Labor Dr. Limbach & Kollegen eGbR"; labor_heidelberg.street = "Im Breitspiel 16"; labor_heidelberg.city = "Heidelberg"; labor_heidelberg.zip = "69126"; @@ -110,7 +110,7 @@ extension Core.Models /** MVZ Labor Limbach Aachen **/ let labor_aachen = Labor() labor_aachen.id = "LABOR_AACHEN"; - labor_aachen.name = "MVZ Labor Limbach Aachen"; + labor_aachen.name = "MVZ Labor Limbach Aachen eGbR"; labor_aachen.street = "Karl-Carstens-Straße 19"; labor_aachen.city = "Würselen"; labor_aachen.zip = "52146"; @@ -136,7 +136,7 @@ extension Core.Models /** MVZ Gemeinschaftslabor Cottbus GbR **/ let labor_cottbus = Labor() labor_cottbus.id = "LABOR_COTTBUS"; - labor_cottbus.name = "MVZ Gemeinschaftslabor Cottbus GbR"; + labor_cottbus.name = "MVZ Gemeinschaftslabor Cottbus GmbH"; labor_cottbus.street = "Uhlandstraße 53"; labor_cottbus.city = "Cottbus"; labor_cottbus.zip = "03050"; @@ -219,7 +219,7 @@ extension Core.Models labor_freiburg.city = "Freiburg"; labor_freiburg.zip = "79100"; labor_freiburg.tel = "+49 761 31905-0"; - labor_freiburg.web = "www.mvz-clotten.de"; + labor_freiburg.web = "www.labor-clotten.de"; labor_freiburg.logo = UIImage(named: "labor_freiburg") labor_freiburg.host = .LABOR_FREIBURG; Labors.append(labor_freiburg); @@ -227,30 +227,17 @@ extension Core.Models /** MVZ Labor Limbach Hannover GbR **/ let labor_hannover = Labor() labor_hannover.id = "LABOR_HANNOVER"; - labor_hannover.name = "MVZ Labor Limbach Hannover GbR"; + labor_hannover.name = "MVZ Labor Limbach Lehrte"; labor_hannover.street = "Auf den Pohläckern 12"; labor_hannover.city = "Lehrte"; labor_hannover.zip = "31275"; labor_hannover.tel = "+49 5132 8695-0"; - labor_hannover.web = "www.labor-limbach-hannover.de"; + labor_hannover.web = "www.labor-limbach-lehrte.de"; labor_hannover.logo = UIImage(named: "labor_hannover") labor_hannover.host = .LABOR_HANNOVER; Labors.append(labor_hannover); - /** MVZ Medizinisches Labor Main-Taunus GbR **/ - let labor_hofheim = Labor() - labor_hofheim.id = "LABOR_HOFHEIM"; - labor_hofheim.name = "MVZ Medizinisches Labor Main-Taunus GbR"; - labor_hofheim.street = "Hofheimer Straße 71"; - labor_hofheim.city = "Hofheim"; - labor_hofheim.zip = "65719"; - labor_hofheim.tel = "+49 6192 9924-0"; - labor_hofheim.web = "www.labor-hofheim.de"; - labor_hofheim.logo = UIImage(named: "labor_hofheim") - labor_hofheim.host = .LABOR_HOFHEIM; - Labors.append(labor_hofheim); - /** MVZ Labor PD Dr. Volkmann und Kollegen GbR **/ let labor_karlsruhe = Labor() labor_karlsruhe.id = "LABOR_KARLSRUHE"; @@ -332,7 +319,7 @@ extension Core.Models /** MVZ Labor Passau GbR **/ let labor_passau = Labor() labor_passau.id = "LABOR_PASSAU"; - labor_passau.name = "MVZ Labor Passau GbR"; + labor_passau.name = "MVZ Labor Passau GmbH"; labor_passau.street = "Wörth 15"; labor_passau.city = "Passau"; labor_passau.zip = "94034"; @@ -384,7 +371,7 @@ extension Core.Models /** Labor MVZ Westmecklenburg GbR **/ let labor_schwerin = Labor() labor_schwerin.id = "LABOR_SCHWERIN"; - labor_schwerin.name = "Labor MVZ Westmecklenburg GbR"; + labor_schwerin.name = "LLabor MVZ Westmecklenburg GmbH"; labor_schwerin.street = "Ellerried 5 – 7"; labor_schwerin.city = "Schwerin"; labor_schwerin.zip = "19061"; @@ -434,7 +421,7 @@ extension Core.Models /** MVZ Medizinisches Labor Hannover **/ let labor_hannover_mlh = Labor() labor_hannover_mlh.id = "LABOR_HANNOVER_MLM"; - labor_hannover_mlh.name = "MVZ Medizinisches Labor Hannover"; + labor_hannover_mlh.name = "MVZ Medizinisches Labor Hannover GmbH"; labor_hannover_mlh.street = "Am TÜV 6"; labor_hannover_mlh.city = "Hannover"; labor_hannover_mlh.zip = "30519";