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

MoK: Bewertungen der Ziele und Maßnahmen wieder möglich

Browse Source
This commit is contained in:
Lyndon Jetten
2024-08-13 11:29:40 +02:00
parent 9c7a3b9a61
commit d6612a8629
4 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
BeWoPlanerMobil/Controllers/MainController.cs
View File

@@ -188,7 +188,7 @@ namespace BeWoPlanerMobil.Controllers
if(Model.EmployeesForGroupAndMultiBooking is null)
{
Model.EmployeesForGroupAndMultiBooking = EmployeeService.GetAllCompactEmployees().OrderBy(e => e.LastName).ToList();
Model.EmployeesForGroupAndMultiBooking = EmployeeService.GetAllCompactEmployees().Where(e => e.ActivationType == ActivationTypeId.Active).OrderBy(e => e.LastName).ToList();
}
if (MobileSessionFacade.CheckForUserRight(UserRightType.ServiceRecord_AllowCreationForOtherEmployees))
@@ -197,7 +197,7 @@ namespace BeWoPlanerMobil.Controllers
}
else if(MobileSessionFacade.CheckForUserRight(UserRightType.ServiceRecord_AllowCreationForOtherTeamMember) && Model.Employee?.EmployeeOid != null)
{
Model.Employees = EmployeeService.GetAllTeamMember(MobileSessionFacade.LoggedInCompactEmployee);
Model.Employees = EmployeeService.GetAllTeamMember(MobileSessionFacade.LoggedInCompactEmployee).Where(e => e.ActivationType == ActivationTypeId.Active).ToList();
}
else
{

8
BeWoPlanerMobil/Controllers/ReportViewerController.cs
View File

@@ -99,6 +99,14 @@ namespace BeWoPlanerMobil.Controllers
Model.Queries = QueryService.GetAllQueriesOfType(QueryType.Public);
foreach(var query in Model.Queries.Where(q => q.Parameter?.Any() ?? false))
{
foreach(var parameter in query.Parameter.Where(p => p.ParamType == QueryParameterType.ValueListEntryType))
{
// ToDo: Hier am 05.08.2024 weitermachen!
}
}
if(Model.Employee?.EmployeeOid.HasValue ?? false)
{
Model.SupportConcepts = EmployeeService.GetActiveSupportConceptsForEmployee(Model.Employee.EmployeeOid, CustomerFilterEnum.All);

2
BeWoPlanerMobil/Models/ReportViewerModel.cs
View File

@@ -195,7 +195,7 @@ namespace BeWoPlanerMobil.Models
public Dictionary<long, SelectedValue> SelectedValues { get; set; } = new Dictionary<long, SelectedValue>();
public Dictionary<ValueListEntryType, List<ValueListEntryDC>> ValueListEntryTypes2ValueListEntries { get; set; } = new Dictionary<ValueListEntryType, List<ValueListEntryDC>>();
public List<SupportConceptCostBearerRelDC> CostBearer2SupportConceptRels { get; set; } = new List<SupportConceptCostBearerRelDC>();
}

8
BeWoPlanerMobil/Views/Main/GoalTreePartial.cshtml
View File

@@ -165,10 +165,10 @@
<div class="custom-control custom-checkbox goal-card-header float-left" onclick="stopToggle(event)" >
<input type="checkbox" class="custom-control-input goal-input" value="@goalTreeItem.ValueListEntryOid" @isCheckedValue id="goal-cb-@goalTreeItem.ValueListEntryOid" onchange="updateSelectedGoals()" />
<label class="custom-control-label goal-name-label @textClass" for="goal-cb-@goalTreeItem.ValueListEntryOid">@goalTreeItem.Header</label>
@if(AbstractModel.HasRightToRateGoals && ratingType != null)
@if(AbstractModel.HasRightToRateGoals)
{
<span style="cursor: pointer;" id="goal-rating-@goalTreeItem.ValueListEntryOid" class="badge badge-bewo-goal-rating goal-rating-badge ml-1" onclick="showGoalRatingPopup(@goalTreeItem.ValueListEntryOid)">
@(ratingType.DisplayName ?? goalTreeItem.RatingName)
@(ratingType?.DisplayName ?? goalTreeItem.RatingName)
</span>
}
</div>
@@ -194,10 +194,10 @@
<div class="custom-control custom-checkbox goal-text @marginBottom">
<input type="checkbox" class="custom-control-input goal-input" id="goal-cb-@goalTreeItem.ValueListEntryOid" @isCheckedValue onchange="updateSelectedGoals()">
<label for="goal-cb-@goalTreeItem.ValueListEntryOid" class="custom-control-label goal-name-label @textClass">@goalTreeItem.Header</label>
@if(AbstractModel.HasRightToRateGoals && ratingType != null)
@if(AbstractModel.HasRightToRateGoals)
{
<span id="goal-rating-@goalTreeItem.ValueListEntryOid" style="cursor: pointer;" class="badge badge-bewo-goal-rating goal-rating-badge ml-1" onclick="showGoalRatingPopup(@goalTreeItem.ValueListEntryOid)">
@(ratingType.DisplayName ?? goalTreeItem.RatingName)
@(ratingType?.DisplayName ?? goalTreeItem.RatingName)
</span>
}
</div>