From b3a443e1db670f5470a5641b5342de32d40f1f24 Mon Sep 17 00:00:00 2001 From: Hamid Reza Mohammadi Date: Sat, 29 Mar 2025 21:26:31 +0330 Subject: [PATCH] #478 contribs page --- GanjooRazor/Pages/Contribs.cshtml | 2 +- GanjooRazor/Pages/Contribs.cshtml.cs | 2 +- .../Pages/_GroupedByDateViewPartial.cshtml | 42 ++++++++++++------- .../Pages/_GroupedByDateViewPartial.cshtml.cs | 1 + GanjooRazor/wwwroot/css/p8.css | 10 +++++ 5 files changed, 40 insertions(+), 17 deletions(-) diff --git a/GanjooRazor/Pages/Contribs.cshtml b/GanjooRazor/Pages/Contribs.cshtml index 0b618774..723411b6 100644 --- a/GanjooRazor/Pages/Contribs.cshtml +++ b/GanjooRazor/Pages/Contribs.cshtml @@ -103,7 +103,7 @@

- گنجور » مشارکت‌های کاربران + مشارکت‌های کاربران

diff --git a/GanjooRazor/Pages/Contribs.cshtml.cs b/GanjooRazor/Pages/Contribs.cshtml.cs index a0e2af6b..c6a37960 100644 --- a/GanjooRazor/Pages/Contribs.cshtml.cs +++ b/GanjooRazor/Pages/Contribs.cshtml.cs @@ -9,7 +9,6 @@ using System.Threading.Tasks; using Microsoft.Extensions.Configuration; using Microsoft.AspNetCore.Mvc.ModelBinding; using Microsoft.AspNetCore.Mvc.ViewFeatures; -using RMuseum.Models.Ganjoor; using RMuseum.Models.Generic.ViewModels; namespace GanjooRazor.Pages @@ -175,6 +174,7 @@ namespace GanjooRazor.Pages { Model = new _GroupedByDateViewPartialModel() { + DataType = dataType, Days = days.ToArray(), Users = users == null ? null :users.ToArray(), Summary = summary diff --git a/GanjooRazor/Pages/_GroupedByDateViewPartial.cshtml b/GanjooRazor/Pages/_GroupedByDateViewPartial.cshtml index 846c449a..0c3b7ec9 100644 --- a/GanjooRazor/Pages/_GroupedByDateViewPartial.cshtml +++ b/GanjooRazor/Pages/_GroupedByDateViewPartial.cshtml @@ -3,26 +3,38 @@ } @if (Model.Summary != null) { -
- @if (Model.Summary.Days != -1) - { + @if (Model.DataType == "users") + { +
+
+
@RMuseum.Services.Implementation.LanguageUtils.FormatMoney(Model.Summary.TotalCount)
+
+ تعداد کل +
+
+
+ + } + else + { +
@RMuseum.Services.Implementation.LanguageUtils.FormatMoney(Model.Summary.Days)
روز مشارکت
- } -
-
@RMuseum.Services.Implementation.LanguageUtils.FormatMoney(Model.Summary.TotalCount)
-
تعداد کل مشارکت‌ها
+
+
@RMuseum.Services.Implementation.LanguageUtils.FormatMoney(Model.Summary.TotalCount)
+
+ تعداد کل مشارکت‌ها +
+
+
+
@RMuseum.Services.Implementation.LanguageUtils.FormatMoney(Model.Summary.UserIds)
+
کاربران مشارکت کننده
+
- @if (Model.Summary.UserIds != -1) - { -
-
@RMuseum.Services.Implementation.LanguageUtils.FormatMoney(Model.Summary.UserIds)
-
کاربران مشارکت کننده
-
- } -
+ + } } diff --git a/GanjooRazor/Pages/_GroupedByDateViewPartial.cshtml.cs b/GanjooRazor/Pages/_GroupedByDateViewPartial.cshtml.cs index 32ad2832..3c247cf9 100644 --- a/GanjooRazor/Pages/_GroupedByDateViewPartial.cshtml.cs +++ b/GanjooRazor/Pages/_GroupedByDateViewPartial.cshtml.cs @@ -5,6 +5,7 @@ namespace GanjooRazor.Pages { public class _GroupedByDateViewPartialModel : PageModel { + public string DataType { get; set; } public GroupedByDateViewModel[] Days { get; set; } public GroupedByUserViewModel[] Users { get; set; } diff --git a/GanjooRazor/wwwroot/css/p8.css b/GanjooRazor/wwwroot/css/p8.css index 0fa581d0..a223494b 100644 --- a/GanjooRazor/wwwroot/css/p8.css +++ b/GanjooRazor/wwwroot/css/p8.css @@ -724,6 +724,16 @@ td.c2 { text-align: center; } +.stats-section-no-grid { + border-radius: 8px; + padding: 20px; + margin-bottom: 30px; + display: grid; + gap: 15px; + text-align: center; +} + + .stat-item { padding: 15px; border-radius: 8px;