diff --git a/Company.Domain/CameraBugReportAgg/CameraBugReport.cs b/Company.Domain/CameraBugReportAgg/CameraBugReport.cs index 1dfefe2a..00da4cd8 100644 --- a/Company.Domain/CameraBugReportAgg/CameraBugReport.cs +++ b/Company.Domain/CameraBugReportAgg/CameraBugReport.cs @@ -92,12 +92,17 @@ public class CameraBugReport public string StackTrace { get; private set; } [BsonElement("status")] + [BsonRepresentation(MongoDB.Bson.BsonType.String)] public CameraBugReportStatus Status { get; private set; } [BsonElement("priority")] + [BsonRepresentation(MongoDB.Bson.BsonType.String)] + public CameraBugPriority Priority { get; private set; } [BsonElement("type")] + [BsonRepresentation(MongoDB.Bson.BsonType.String)] + public CameraBugReportType Type { get; private set; } [BsonElement("flavor")] diff --git a/ServiceHost/Areas/AdminNew/Pages/BugReport/Delete.cshtml b/ServiceHost/Areas/AdminNew/Pages/BugReport/Delete.cshtml index 9ab97390..53bd9183 100644 --- a/ServiceHost/Areas/AdminNew/Pages/BugReport/Delete.cshtml +++ b/ServiceHost/Areas/AdminNew/Pages/BugReport/Delete.cshtml @@ -1,4 +1,4 @@ -@page "{id:long}" +@page @model ServiceHost.Areas.AdminNew.Pages.BugReport.DeleteModel @{ diff --git a/ServiceHost/Areas/AdminNew/Pages/BugReport/Details.cshtml b/ServiceHost/Areas/AdminNew/Pages/BugReport/Details.cshtml index ee1eb712..41821ae6 100644 --- a/ServiceHost/Areas/AdminNew/Pages/BugReport/Details.cshtml +++ b/ServiceHost/Areas/AdminNew/Pages/BugReport/Details.cshtml @@ -1,4 +1,4 @@ -@page "{id:long}" +@page @model ServiceHost.Areas.AdminNew.Pages.BugReport.DetailsModel @{ diff --git a/ServiceHost/Areas/AdminNew/Pages/BugReport/Details.cshtml.cs b/ServiceHost/Areas/AdminNew/Pages/BugReport/Details.cshtml.cs index 99774bf7..4ccdb228 100644 --- a/ServiceHost/Areas/AdminNew/Pages/BugReport/Details.cshtml.cs +++ b/ServiceHost/Areas/AdminNew/Pages/BugReport/Details.cshtml.cs @@ -8,9 +8,10 @@ public class DetailsModel : BugReportPageModel { } - public void OnGet(Guid id) + public void OnGet(string id) { - BugReportDetails = GetBugReportDetails(id); + var guid = Guid.Parse(id); + BugReportDetails = GetBugReportDetails(guid); if (BugReportDetails == null) { TempData["ErrorMessage"] = "گزارش خرابی یافت نشد"; diff --git a/ServiceHost/Areas/AdminNew/Pages/BugReport/Edit.cshtml b/ServiceHost/Areas/AdminNew/Pages/BugReport/Edit.cshtml index 057c974c..3376ae9c 100644 --- a/ServiceHost/Areas/AdminNew/Pages/BugReport/Edit.cshtml +++ b/ServiceHost/Areas/AdminNew/Pages/BugReport/Edit.cshtml @@ -1,4 +1,4 @@ -@page "{id:long}" +@page @model ServiceHost.Areas.AdminNew.Pages.BugReport.EditModel @{ diff --git a/ServiceHost/Areas/AdminNew/Pages/BugReport/Index.cshtml b/ServiceHost/Areas/AdminNew/Pages/BugReport/Index.cshtml index 022bb790..e1078639 100644 --- a/ServiceHost/Areas/AdminNew/Pages/BugReport/Index.cshtml +++ b/ServiceHost/Areas/AdminNew/Pages/BugReport/Index.cshtml @@ -3,6 +3,21 @@ @{ ViewData["Title"] = "مدیریت گزارش‌های خرابی"; + }
@@ -141,7 +156,7 @@ @report.CreationDate.ToString("yyyy-MM-dd HH:mm") - مشاهده + مشاهده ویرایش حذف @@ -163,19 +178,5 @@
- diff --git a/ServiceHost/Areas/AdminNew/Pages/Company/Task/DetailsModalOld.cshtml b/ServiceHost/Areas/AdminNew/Pages/Company/Task/DetailsModalOld.cshtml deleted file mode 100644 index e902efaa..00000000 --- a/ServiceHost/Areas/AdminNew/Pages/Company/Task/DetailsModalOld.cshtml +++ /dev/null @@ -1,212 +0,0 @@ -@model AccountManagement.Application.Contracts.Task.EditTask -@using AccountManagement.Application.Contracts.Media -@using Version = _0_Framework.Application.Version - -@{ - MediaViewModel voice = new(); -} - -@{ - - - - - -} - - -
- -
- - @{ - if (Model.IsDone) - { - - } - else - { - - } - } -
- -
-
- -
-
-
طرف حساب:
-
-
-
@Model.ContractingPartyName
-
-
- -
-
-
عنوان وظیفه:
-
-
-
@Model.Title
-
-
- -
-
-
-
-
تاریخ انجام:
-
-
-
@Model.EndTaskDate
-
-
-
-
-
-
-
ساعت انجام:
-
-
-
@Model.EndTaskTime
-
-
-
-
- -
-
-
توضیحات:
-
-
-

@Html.Raw(Model.Description)

-
-
- - @if (!string.IsNullOrWhiteSpace(Model.CompleteDescription)) - { -
-
-
توضیحات تکمیلی:
-
-
-

@Html.Raw(Model.CompleteDescription)

-
-
- } - -
-
-
فایل:
-
-
-
- @foreach (var item in Model.medias) - { - if (item.Category == "فایل") - { -
-
- @if (item.Path.EndsWith(".jpg") || item.Path.EndsWith(".jpeg") || item.Path.EndsWith(".png") || item.Path.EndsWith(".gif") || item.Path.EndsWith(".webp")) - { -
-
-
-
- -
-
-
-
-
- - - - - - - - - - - - - - - - -
- lightboximage - -
-
- } - else - { - دانلود - } -
-
- } - } -
-
-
- -
-
-
پیام صوتی:
-
-
- @foreach (var item in Model.medias) - { - if (item.Category == "صوت") - { - voice = item; -
-
- -
- @*
- 0:00 - 0:00 -
*@ - @* *@ - } - } -
-
- -
-
- - -
-
-
- -
- @*
- - -
*@ -
-
-
- - - - - - - diff --git a/ServiceHost/Areas/AdminNew/Pages/Company/Task/OperationRequestModalOld.cshtml b/ServiceHost/Areas/AdminNew/Pages/Company/Task/OperationRequestModalOld.cshtml deleted file mode 100644 index 5aeac48e..00000000 --- a/ServiceHost/Areas/AdminNew/Pages/Company/Task/OperationRequestModalOld.cshtml +++ /dev/null @@ -1,579 +0,0 @@ -@model AccountManagement.Application.Contracts.Task.OperationModalViewModel -@using Version = _0_Framework.Application.Version - -@{ - - - - - -} -@{ - - - switch (Model.Type) - { - case "request_time": - -
-
- - -
- -
- -
-
-
-
طرف حساب:
-
-
-
@Model.TaskDetails.ContractingPartyName
-
-
- -
-
-
عنوان وظیفه:
-
-
-
@Model.TaskDetails.Title
-
-
- -
-
-
-
-
تاریخ انجام:
-
-
-
@Model.TaskDetails.EndTaskDate
-
-
-
-
-
-
-
ساعت انجام:
-
-
-
@Model.TaskDetails.EndTaskTime
-
-
-
-
- -
-
-
توضیحات:
-
-
-

@Html.Raw(Model.TaskDetails.Description)

-
-
- - -
-
-
تاریخ درخواست:
-
-
-
@Model.ModalTaskRequest.RequestTaskDate
-
-
-
-
-
توضیحات درخواست:
-
-
-

@Html.Raw(Model.ModalTaskRequest.TimeRequestDescription)

-
-
- -
-
-
فایل:
-
-
-
- @foreach (var item in Model.TaskDetails.medias) - { - if (item.Category == "فایل") - { -
-
- @if (item.Path.EndsWith(".jpg") || item.Path.EndsWith(".jpeg") || item.Path.EndsWith(".png") || item.Path.EndsWith(".gif") || item.Path.EndsWith(".webp")) - { -
-
-
-
- -
-
-
-
-
- - - - - - - - - - - - - - - - -
- lightboximage - -
-
- } - else - { - دانلود - } -
-
- } - } -
-
-
- -
-
-
پیام صوتی:
-
-
- @foreach (var item in Model.TaskDetails.medias) - { - if (item.Category == "صوت") - { - - } - } -
-
- - -
-
- -
-
-
-
- - -
-
-
-
- - -
-
-
-
-
- - -
-
-
- -
-
-
- -
-
-
-
- break; - - case "cancel_request": -
-
- - -
-
- -
- - -
-
-
طرف حساب:
-
-
-
@Model.TaskDetails.ContractingPartyName
-
-
- -
-
-
عنوان وظیفه:
-
-
-
@Model.TaskDetails.Title
-
-
- -
-
-
-
-
تاریخ انجام:
-
-
-
@Model.TaskDetails.EndTaskDate
-
-
-
-
-
-
-
ساعت انجام:
-
-
-
@Model.TaskDetails.EndTaskTime
-
-
-
-
- -
-
-
توضیحات:
-
-
-

@Html.Raw(Model.TaskDetails.Description)

-
-
- -
-
-
توضیحات درخواست:
-
-
-

@Html.Raw(Model.ModalTaskRequest.CancelDescription)

-
-
- -
-
-
فایل:
-
-
-
- @foreach (var item in Model.TaskDetails.medias) - { - if (item.Category == "فایل") - { -
-
- @if (item.Path.EndsWith(".jpg") || item.Path.EndsWith(".jpeg") || item.Path.EndsWith(".png") || item.Path.EndsWith(".gif") || item.Path.EndsWith(".webp")) - { -
-
-
-
- -
-
-
-
-
- - - - - - - - - - - - - - - - -
- lightboximage - -
-
- } - else - { - دانلود - } -
-
- } - } -
-
-
- -
-
-
پیام صوتی:
-
-
- @foreach (var item in Model.TaskDetails.medias) - { - if (item.Category == "صوت") - { - - } - } -
-
- - -
-
- -
-
-
- - -
-
-
- - -
-
-
- -
-
-
-
- break; - - - case "complete_request": -
-
- - -
- -
-
- -
-
-
طرف حساب:
-
-
-
@Model.TaskDetails.ContractingPartyName
-
-
- -
-
-
عنوان وظیفه:
-
-
-
@Model.TaskDetails.Title
-
-
- -
-
-
-
-
تاریخ انجام:
-
-
-
@Model.TaskDetails.EndTaskDate
-
-
-
-
-
-
-
ساعت انجام:
-
-
-
@Model.TaskDetails.EndTaskTime
-
-
-
-
- -
-
-
توضیحات:
-
-
-

@Html.Raw(Model.TaskDetails.Description)

-
-
- -
-
-
توضیحات درخواست:
-
-
-

@Html.Raw(Model.ModalTaskRequest.IsDoneDescription)

-
-
- - -
-
-
فایل:
-
-
-
- @foreach (var item in Model.TaskDetails.medias) - { - if (item.Category == "فایل") - { -
-
- @if (item.Path.EndsWith(".jpg") || item.Path.EndsWith(".jpeg") || item.Path.EndsWith(".png") || item.Path.EndsWith(".gif") || item.Path.EndsWith(".webp")) - { -
-
-
-
- -
-
-
-
-
- - - - - - - - - - - - - - - - -
- lightboximage - -
-
- } - else - { - دانلود - } -
-
- } - } -
-
-
- -
-
-
پیام صوتی:
-
-
- @foreach (var item in Model.TaskDetails.medias) - { - if (item.Category == "صوت") - { - - } - } -
-
-
-
- -
-
-
- - -
-
-
- -
-
-
- -
-
-
-
- break; - - } -} - - - - - - - - - diff --git a/ServiceHost/Areas/Client/Pages/Company/Ticket/DetailTicketModalOld.cshtml b/ServiceHost/Areas/Client/Pages/Company/Ticket/DetailTicketModalOld.cshtml deleted file mode 100644 index ae89cf1c..00000000 --- a/ServiceHost/Areas/Client/Pages/Company/Ticket/DetailTicketModalOld.cshtml +++ /dev/null @@ -1,698 +0,0 @@ -@model AccountManagement.Application.Contracts.Ticket.EditTicket - -@{ -} - -
-
- - -
- -
- -
-
-
-
- @Model.ContractingPartyName - @Model.WorkshopName -
-
شماره تماس: @Model.Sender.Mobile
-
- -
- - -
- -
- - - -
-
- -
- - -
-
- -
- - -
- -
-
- - - - - - - -
- -
-
- -
- - -
- - -
-
- - -
-
-
-
-
- -
-
-
- -
-
-
- -
- - - -
- - - \ No newline at end of file diff --git a/ServiceHost/Pages/Shared/_Layout_Old.cshtml b/ServiceHost/Pages/Shared/_Layout_Old.cshtml deleted file mode 100644 index 40e7ed1b..00000000 --- a/ServiceHost/Pages/Shared/_Layout_Old.cshtml +++ /dev/null @@ -1,160 +0,0 @@ -@using Microsoft.AspNetCore.Razor.Language.Intermediate - - - - - - - - - - - @ViewData["Title"] | دادمهر گستر - - - - - - - - - - - - - - - - - @**@ - - - - - - - - - @**@ - - - - - - - - - - - -
- - - - - - - - - - - - - - - - -
-
- - @RenderBody() - -
- -
- - - - - - - -
- - @**@ - - - @**@ - - @**@ - - @* - - - - - - - - - - - *@ - - - - - - - - - - - - - - - - - - - - - - - @*-->*@ - - @* - *@ - - @* - - - *@ - - @RenderSection("Script", false) - - - - - - - - -