Konflikte gelöst

Shared/BeWoEntityEnums.cs

@@ -200,10 +200,14 @@ namespace BS.Shared
 		AiUserSetting = 189,
         AiPromptbausteinRoutine = 190,
         AiPromptbausteinRoutineStep = 191,
-	}
+        TeamFolderRight = 192
+    }
 
     public enum SystemEntryID
     {
+        // Endgültig gelöscht
+        DeletedPermanently = -1,
+
         // LVR Kostenträger
         CostBearerLVR = 0,
 
@@ -534,6 +538,10 @@ namespace BS.Shared
         DocumentsEditFolders = 22012,
         DocumentsUploadAll = 22013,
         DocumentsDeleteAll = 22014,
+        VorlagenEditAll = 22020,
+        VorlagenEditOwnTeams = 22021,
+        VorlagenViewAll = 22022,
+        VorlagenViewOwnTeams = 22023,
 
         Customer_ViewMedication = 22100,
         Customer_ViewDiagnosis = 22101,
@@ -591,6 +599,8 @@ namespace BS.Shared
         Finance_Gkv_Delete = 26113,
 
         Customer_EditMedication = 27000,
+        Customer_CreateMedication = 27001,
+        Customer_DeleteMedication = 27002,
         //MedRecordsAnsehen = 27001,
         //MedRecordsAnlegen = 27002,
         //MedRecordsAendern = 27003,

Shared/Core/EnumTranslations.cs

@@ -720,7 +720,9 @@ namespace BS.Shared.Core
 			dict.Add(UserRightType.Customer_ViewMyTeams, Translator.Translate("Klienten") + " ansehen (von Teams betreut)");
 			dict.Add(UserRightType.Customer_ViewMedication, Translator.Translate("Klienten") + " Medikation ansehen");
 			dict.Add(UserRightType.Customer_EditMedication, Translator.Translate("Klienten") + " Medikation bearbeiten");
-			dict.Add(UserRightType.Customer_ViewDiagnosis, Translator.Translate("Klienten") + " Diagnosen ansehen");
+            dict.Add(UserRightType.Customer_DeleteMedication, Translator.Translate("Klienten") + " Medikation löschen");
+            dict.Add(UserRightType.Customer_CreateMedication, Translator.Translate("Klienten") + " Medikation anlegen");
+            dict.Add(UserRightType.Customer_ViewDiagnosis, Translator.Translate("Klienten") + " Diagnosen ansehen");
 			dict.Add(UserRightType.Customer_ViewNotizen, Translator.Translate("Klienten") + " Notizen ansehen");
 			dict.Add(UserRightType.Customer_EditNotizen, Translator.Translate("Klienten") + " Notizen bearbeiten");
 			dict.Add(UserRightType.Customer_DeleteNotizen, Translator.Translate("Klienten") + " Notizen löschen");
@@ -930,6 +932,10 @@ namespace BS.Shared.Core
             dict.Add(UserRightType.DocumentsUploadAll, Translator.Translate("Dokumente hochladen"));
             dict.Add(UserRightType.DocumentsDeleteAll, Translator.Translate("Dokumente löschen"));
             dict.Add(UserRightType.DocumentsEditFolders, Translator.Translate("Dokumente Ordner bearbeiten"));
+            dict.Add(UserRightType.VorlagenEditAll, Translator.Translate("Vorlagen bearbeiten (alle)"));
+            dict.Add(UserRightType.VorlagenEditOwnTeams, Translator.Translate("Vorlagen bearbeiten (der eigenen Teams)"));
+            dict.Add(UserRightType.VorlagenViewAll, Translator.Translate("Vorlagen verwenden (alle)"));
+            dict.Add(UserRightType.VorlagenViewOwnTeams, Translator.Translate("Vorlagen verwenden (der eigenen Teams)"));
             dict.Add(UserRightType.ServiceRecordAllowEditAfterMindays, Translator.Translate("Zeiterfassung Einträge nach Ablauf der Eingabefrist bearbeiten"));
             dict.Add(UserRightType.Betreuungsschluessel_View, Translator.Translate("BetreuerSingular") + " bei Hilfeplänen ansehen");
             dict.Add(UserRightType.Betreuungsschluessel_Create, Translator.Translate("BetreuerSingular") + " bei Hilfeplänen anlegen");

Shared/DataContracts/InactivePersonDC.cs

@@ -19,10 +19,11 @@ namespace BS.Shared.DataContracts
         [DataMember] public string PostalCode { get; set; }
         [DataMember] public string Town { get; set; }
         [DataMember] public DateTime? LastUsedOn { get; set; }
+        [DataMember] public DateTime? InsTs { get; set; }
         [DataMember] public string Notice { get; set; }
         [DataMember] public long? PersonOid { get; set; }
         [DataMember] public long? ObjectOid { get; set; }
-        [DataMember] public long? ObjectTid { get; set; }
+        [DataMember] public TableID ObjectTid { get; set; }
         [DataMember] public bool IsChecked { get; set; }
     }
 }

Shared/DataContracts/LicenseInfoDC.cs

@@ -18,6 +18,12 @@ namespace BS.Shared.DataContracts
         [DataMember]
         public int MaxLicenseCount { get; set; }
 
+        [DataMember]
+        public int MaxMidLicenseCount { get; set; }
+
+        [DataMember]
+        public bool IsHybrid { get; set; }
+
         [DataMember]
         public decimal PercentFreeEmployee { get; set; }
 

Shared/DataContracts/TeamFolderRightDC.cs

@@ -0,0 +1,25 @@
+using System.Runtime.Serialization;
+
+namespace BS.Shared.DataContracts
+{
+    [DataContract]
+    public partial class TeamFolderRightDC : IDataContract
+    {
+        [DataMember]
+        public long? Oid { get; set; }
+
+        [DataMember]
+        public long? Version { get; set; }
+
+        [DataMember]
+        public long TeamOid { get; set; }
+
+        [DataMember]
+        public long BeWoFolderOid { get; set; }
+        [DataMember]
+        public bool AllowEdit { get; set; }
+        [DataMember]
+        public bool AllowView { get; set; }
+
+    }
+}

Shared/Shared.csproj

@@ -194,6 +194,7 @@
     <Compile Include="DataContracts\AdminService\AdminServiceSumResponseDetailDC.cs" />
     <Compile Include="DataContracts\AdminService\IAdminServiceDC.cs" />
     <Compile Include="DataContracts\AdminService\AdminServiceSumReqDC.cs" />
+    <Compile Include="DataContracts\TeamFolderRightDC.cs" />
     <Compile Include="DataContracts\Feature\AI\AiPromptbausteinRoutineDC.cs" />
     <Compile Include="DataContracts\Feature\AI\AiPromptbausteinRoutineStepDC.cs" />
     <Compile Include="DataContracts\Feature\AI\AiUserSettingDC.cs" />