ownSoft/BeWoPlaner
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Diverse Kleinigkeiten

Browse Source 
- Sortierung von Dateien,
- Text "Nicht bewilligt" im Hilfeplanauswahlfenster in Zeiterfassung anzeigen
- Demo Dialog auch für Testversion für Fortis
This commit is contained in:
Christian
2025-10-24 02:00:27 +02:00
parent ec6bc596b7
commit fa4d3fcbd7
7 changed files with 70 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
BeWo/ConfirmDemoDialog.xaml.cs
View File

@@ -12,10 +12,20 @@ namespace BeWo
public ConfirmDemoDialog()
{
InitializeComponent();
CountButton.Content = "Bitte warten (10 sek.)";
CountButton.IsEnabled = false;
this.Loaded += new RoutedEventHandler(ConfirmDemoDialog_Loaded);
if (BeWoApp.Tenant == "7514581436")
{
CountButton.Content = "OK";
CountButton.IsEnabled = true;
}
else
{
CountButton.Content = "Bitte warten (10 sek.)";
CountButton.IsEnabled = false;
this.Loaded += new RoutedEventHandler(ConfirmDemoDialog_Loaded);
}
}

2
BeWo/MainWindow.xaml.cs
View File

@@ -44,7 +44,7 @@ namespace BeWo
// dlg.ShowDialog();
//}
#else
if (BeWoApp.Tenant == "demo")
if (BeWoApp.Tenant == "demo" || BeWoApp.Tenant == "7514581436")
{
var dlg = new ConfirmDemoDialog();
dlg.ShowDialog();

2
BeWo/View/BeWoFileView.xaml
View File

@@ -87,7 +87,7 @@
</DataTemplate>
</dxg:GridColumn.CellTemplate>
</dxg:GridColumn>
<dxg:GridColumn FieldName="InsertedOn" AllowEditing="False" Header="hinterlegt am" Width="150" />
<dxg:GridColumn FieldName="InsertedOn" AllowEditing="False" Header="hinterlegt am" Width="150" SortOrder="Ascending"/>
<dxg:GridColumn FieldName="InsertedBy" AllowEditing="False" Header="hinterlegt von" Width="150" />
<dxg:GridColumn FieldName="FileName" AllowEditing="False" Header="Dateiname" Width="180" />
<dxg:GridColumn FieldName="Description" AllowEditing="False" Header="Beschreibung" Width="180" />

41
Model/Changes_alle_fuer_neue_db.txt
View File

@@ -1697,3 +1697,44 @@ CREATE TABLE `person2team` (
ALTER TABLE `Team`
ADD COLUMN `IsOwnChatTeam` int DEFAULT NULL;
CREATE TABLE `StoredFile` (
`Oid` bigint NOT NULL AUTO_INCREMENT,
`InsTs` datetime DEFAULT NULL,
`InsUser` varchar(255) DEFAULT NULL,
`Notice` varchar(1024) DEFAULT NULL,
`Tid` int DEFAULT NULL,
`UdpUser` varchar(255) DEFAULT NULL,
`Version` bigint DEFAULT NULL,
`IsActive` tinyint DEFAULT NULL,
`SystemEntryID` int DEFAULT NULL,
`FileName` varchar(255),
`FilePath` varchar(1024),
`ContentType` varchar(127),
`Size` bigint,
`Checksum` varchar(64),
`BeWoObjectTid` int,
`BeWoObjectOid` bigint,
PRIMARY KEY (`Oid`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1;
ALTER TABLE `invoicebase`
ADD COLUMN `XRechnungStoredFileOid` BIGINT NULL DEFAULT NULL AFTER `StornoInvoiceBaseOid`,
ADD INDEX `FK_IN_SFILE_idx` (`XRechnungStoredFileOid` ASC);
ALTER TABLE `invoicebase`
ADD CONSTRAINT `FK_IN_SFILE`
FOREIGN KEY (`XRechnungStoredFileOid`)
REFERENCES `storedfile` (`Oid`)
ON DELETE CASCADE
ON UPDATE CASCADE;
ALTER TABLE `team`
DROP FOREIGN KEY `FK_TEAM_LEADER_EMPLOYEE`;
ALTER TABLE `team`
CHANGE COLUMN `EmployeeOid` `EmployeeOid` BIGINT NULL ;
ALTER TABLE `team`
ADD CONSTRAINT `FK_TEAM_LEADER_EMPLOYEE`
FOREIGN KEY (`EmployeeOid`)
REFERENCES `employee` (`Oid`);

2
Service/Plugins/PluginLoader.cs
View File

@@ -178,7 +178,7 @@ namespace BeWo.Service.Plugins
//t = "6340891020"; // Caritas Ahlen
//t = "3659854106"; // alpha e.V.
//t = "5809130435"; // Lebenshilfe Kusel
//t = "3367947706"; // PaS Mönchengladbach
t = "3367947706"; // PaS Mönchengladbach
//t = "2331203795"; // BeWo für dich
//t = "5426234256"; // SKM Leverkusen
//t = "4137042939"; // MLG Lebengestalten / Haus Müllestumpe

5
Service/ServiceContracts/IEmployeeService.cs
View File

@@ -128,6 +128,11 @@ namespace BeWo.Service.ServiceContracts
[OperationContract]
List<CompactTeamDC> GetAllTeamsCompact();
[FaultContract(typeof(BeWoFault))]
[OperationContract]
List<CompactTeamDC> GetAllTeamsIncludingOwnChatCompact();
[FaultContract(typeof (BeWoFault))]
[OperationContract]
List<AssessmentSheetEntryDC> GetAssessmentSheetEntriesForCustomer(long customerOid, DateTime startDt,

7
Shared/DataContracts/ClientPartials/FlatSupportConceptTreeNodeDC.cs
View File

@@ -28,7 +28,12 @@ namespace BS.Shared.DataContracts
if (this.SupportConceptTreeNodeDC.CostBearer != null)
{
return this.SupportConceptTreeNodeDC.CostBearer.ToString();
String cb = this.SupportConceptTreeNodeDC.CostBearer.ToString();
if (this.SupportConceptTreeNodeDC.SupportConceptCostBearerRelDC != null && this.SupportConceptTreeNodeDC.SupportConceptCostBearerRelDC.Status != CostBearer2SupportConceptStatus.Approved)
{
cb = String.Format("{0} (nicht bewilligt)", cb);
}
return cb;
}
return string.Empty;