Merge branch 'develop'

vegaitglobal · Oct 17, 2023 · 7aebbf5 · 7aebbf5
2 parents 8fd3c46 + d8e7025
commit 7aebbf5
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 3 deletions.
diff --git a/.vs/VSWorkspaceState.json b/.vs/VSWorkspaceState.json
@@ -0,0 +1,7 @@
+{
+ "ExpandedNodes": [
+ ""
+ ],
+ "SelectedNode": "\\binding.sln",
+ "PreviewInSolutionExplorer": false
+}
diff --git a/.vs/sloboda-nema-cenu-website/v17/.wsuo b/.vs/sloboda-nema-cenu-website/v17/.wsuo
diff --git a/Hakaton.SlobodaNemaCenu/Hakaton.SlobodaNemaCenu.Web/Views/ActivitiesPage.cshtml b/Hakaton.SlobodaNemaCenu/Hakaton.SlobodaNemaCenu.Web/Views/ActivitiesPage.cshtml
@@ -4,6 +4,8 @@
 @{
  Layout = "_Layout.cshtml";
  var children = Model.Children<ContentModels.ActivityPage>().OrderByDescending(d => d.Date);
+
+
 }
 
 
@@ -31,11 +33,26 @@
  <div class="swiper-wrapper">
  <!-- Slides -->
  @foreach (var item in children){
+
+ string dayStr = item.Date.Day.ToString();
+ if (dayStr.Length == 1)
+ {
+ dayStr = "0" + dayStr;
+ }
+
+ string monthStr = item.Date.Month.ToString();
+ if (monthStr.Length == 1)
+ {
+ monthStr = "0" + monthStr;
+ }
+
+ string yearStr = item.Date.Year.ToString();
+
  <div class="swiper-slide related-news__card">
  <div class="rated-news__card-top">
  <img src="@item.PreviewImage?.GetCropUrl()" alt="Card img" />
  <div class="related-news__tags">
- <span class="related-news__tag date">@item.Date.ToString("dd/MM/yyyy") </span>
+ <span class="related-news__tag date">@dayStr/@monthStr/@yearStr</span>
  <span class="related-news__tag place">@item.Category</span>
  </div>
  </div>

diff --git a/...enu/Hakaton.SlobodaNemaCenu.Web/Views/Partials/blocklist/Components/imageAndTextV2.cshtml b/...enu/Hakaton.SlobodaNemaCenu.Web/Views/Partials/blocklist/Components/imageAndTextV2.cshtml
@@ -15,7 +15,7 @@
  <p class="text-small">
  @item.Description
  </p>
- @if (!string.IsNullOrWhiteSpace(@item.ShortText))
+ @if (!string.IsNullOrWhiteSpace(item.ShortText))
  {
  <div class="image-box__comment">
  <span>@item.ShortText</span>

diff --git a/...enu/Hakaton.SlobodaNemaCenu.Web/Views/Partials/blocklist/Components/relatedContent.cshtml b/...enu/Hakaton.SlobodaNemaCenu.Web/Views/Partials/blocklist/Components/relatedContent.cshtml
@@ -16,11 +16,26 @@
  <!-- Slides -->
  @foreach(var content in items)
  {
+
+ string dayStr = content.Date.Day.ToString();
+ if (dayStr.Length == 1)
+ {
+ dayStr = "0" + dayStr;
+ }
+
+ string monthStr = content.Date.Month.ToString();
+ if (monthStr.Length == 1)
+ {
+ monthStr = "0" + monthStr;
+ }
+
+ string yearStr = content.Date.Year.ToString();
+
  <div class="swiper-slide related-news__card">
  <div class="rated-news__card-top">
  <img src="@content.PreviewImage.GetCropUrl()" alt="Card img" />
  <div class="related-news__tags">
- <span class="related-news__tag date">@content.Date.ToString("dd/mm/yyyy")</span>
+  <span class="related-news__tag date">@dayStr/@monthStr/@yearStr</span>
  <span class="related-news__tag place">@content.Category</span>
  </div>
  </div>