Itt maradt
This commit is contained in:
@@ -19,7 +19,7 @@ namespace WorkFlowCheck.MAUI.Helper
|
|||||||
public static string DatabaseName = "";
|
public static string DatabaseName = "";
|
||||||
public static bool Syncronised = false;
|
public static bool Syncronised = false;
|
||||||
public static UserDTO SystemUserDTO;
|
public static UserDTO SystemUserDTO;
|
||||||
public static string ProgramVersion = "v1.1.025";
|
public static string ProgramVersion = "v1.1.027";
|
||||||
|
|
||||||
#if DEBUG
|
#if DEBUG
|
||||||
public static string ApiBaseUrl = $"https://dev.wfcapi.nuvolar.hu/";
|
public static string ApiBaseUrl = $"https://dev.wfcapi.nuvolar.hu/";
|
||||||
|
|||||||
@@ -251,7 +251,7 @@ public partial class CheckListPage : ContentPage
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|
||||||
await SystemHelper.ShowSnackBar("Blokkolás feloldás SIKERTELEN!",
|
await SystemHelper.ShowSnackBar("Blokkolás feloldás SIKERTELEN!",
|
||||||
SystemHelper.ColorToHex(Colors.Red),
|
SystemHelper.ColorToHex(Colors.Red),
|
||||||
SystemHelper.ColorToHex(Colors.Red),
|
SystemHelper.ColorToHex(Colors.Red),
|
||||||
@@ -293,7 +293,7 @@ public partial class CheckListPage : ContentPage
|
|||||||
var popup = new InputPopup("Kérem adja meg a lezárás okát!");
|
var popup = new InputPopup("Kérem adja meg a lezárás okát!");
|
||||||
var (isConfirmed, userInput) = await popup.ShowAsync();
|
var (isConfirmed, userInput) = await popup.ShowAsync();
|
||||||
|
|
||||||
|
|
||||||
if (isConfirmed && !string.IsNullOrEmpty(userInput))
|
if (isConfirmed && !string.IsNullOrEmpty(userInput))
|
||||||
{
|
{
|
||||||
var checkListHeaderCloseDTO = new CheckListHeaderCloseDTO()
|
var checkListHeaderCloseDTO = new CheckListHeaderCloseDTO()
|
||||||
@@ -384,7 +384,11 @@ public partial class CheckListPage : ContentPage
|
|||||||
if (!isAdmin)
|
if (!isAdmin)
|
||||||
{
|
{
|
||||||
var result = checkListHeaderDTOs
|
var result = checkListHeaderDTOs
|
||||||
.Where(w => w.UserId == userDTO.Id && w.CheckStatus != CheckStatus.Blocked).ToList();
|
.Where(w => w.UserId == userDTO.Id &&
|
||||||
|
//w.CheckStatus != CheckStatus.Blocked &&
|
||||||
|
w.CheckStatus != CheckStatus.Sent &&
|
||||||
|
w.CheckStatus != CheckStatus.Closed
|
||||||
|
).ToList();
|
||||||
CheckList.ItemsSource = result;
|
CheckList.ItemsSource = result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -99,7 +99,8 @@ namespace WorkFlowCheck.MAUI.Services
|
|||||||
.Include(i => i.CheckListTemplateHeader)
|
.Include(i => i.CheckListTemplateHeader)
|
||||||
.Where(w => w.CheckStatus == CheckStatus.Open ||
|
.Where(w => w.CheckStatus == CheckStatus.Open ||
|
||||||
w.CheckStatus == CheckStatus.InProgress ||
|
w.CheckStatus == CheckStatus.InProgress ||
|
||||||
w.CheckStatus == CheckStatus.Blocked)
|
w.CheckStatus == CheckStatus.Blocked ||
|
||||||
|
w.CheckStatus == CheckStatus.Sent)
|
||||||
.ToListAsync();
|
.ToListAsync();
|
||||||
retVal = _mapper.Map<List<CheckListHeaderDTO>>(res);
|
retVal = _mapper.Map<List<CheckListHeaderDTO>>(res);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,2 +1,2 @@
|
|||||||
dotnet publish -f net8.0-android -c Release -p:AndroidPackageFormat=apk
|
dotnet publish -f net8.0-android -c Release -p:AndroidPackageFormat=apk
|
||||||
pause
|
pause
|
||||||
Reference in New Issue
Block a user