claunia/marechai
1
0
Fork 0
mirror of https://github.com/claunia/marechai.git synced 2025-12-16 19:14:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add markdown rendering of company description.

Browse Source
This commit is contained in:
Natalia Portillo
2018-04-20 08:08:40 +01:00
parent a96c093757
commit 5aa17517d8
3 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cicm_web/Models/Company.cs
View File

@@ -32,6 +32,7 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using Cicm.Database.Schemas; using Cicm.Database.Schemas;
using Markdig;
namespace cicm_web.Models namespace cicm_web.Models
{ {
@@ -60,6 +61,7 @@ namespace cicm_web.Models
public static CompanyWithItems GetItem(int id) public static CompanyWithItems GetItem(int id)
{ {
Cicm.Database.Schemas.Company dbItem = Program.Database?.Operations.GetCompany(id); Cicm.Database.Schemas.Company dbItem = Program.Database?.Operations.GetCompany(id);
MarkdownPipeline pipeline = new Markdig.MarkdownPipelineBuilder().UseAdvancedExtensions().Build();
return dbItem == null return dbItem == null
? null ? null
@@ -83,7 +85,7 @@ namespace cicm_web.Models
Website = dbItem.Website, Website = dbItem.Website,
Logos = dbItem.Logos, Logos = dbItem.Logos,
LastLogo = dbItem.LastLogo, LastLogo = dbItem.LastLogo,
Description = dbItem.Description Description = dbItem.Description == null ? null : Markdig.Markdown.ToHtml(dbItem.Description, pipeline)
}; };
} }
@@ -92,6 +94,7 @@ namespace cicm_web.Models
List<Cicm.Database.Schemas.Company> dbItems = null; List<Cicm.Database.Schemas.Company> dbItems = null;
bool? result = Program.Database?.Operations.GetCompanies(out dbItems); bool? result = Program.Database?.Operations.GetCompanies(out dbItems);
if(result == null || result.Value == false || dbItems == null) return null; if(result == null || result.Value == false || dbItems == null) return null;
MarkdownPipeline pipeline = new Markdig.MarkdownPipelineBuilder().UseAdvancedExtensions().Build();
return dbItems.Select(t => new CompanyWithItems return dbItems.Select(t => new CompanyWithItems
{ {
@@ -113,7 +116,7 @@ namespace cicm_web.Models
Website = t.Website, Website = t.Website,
Logos = t.Logos, Logos = t.Logos,
LastLogo = t.LastLogo, LastLogo = t.LastLogo,
Description = t.Description Description = t.Description == null ? null : Markdig.Markdown.ToHtml(t.Description, pipeline)
}).OrderBy(t => t.Name).ToArray(); }).OrderBy(t => t.Name).ToArray();
} }
@@ -122,6 +125,7 @@ namespace cicm_web.Models
List<Cicm.Database.Schemas.Company> dbItems = null; List<Cicm.Database.Schemas.Company> dbItems = null;
bool? result = Program.Database?.Operations.GetCompanies(out dbItems); bool? result = Program.Database?.Operations.GetCompanies(out dbItems);
if(result == null || result.Value == false || dbItems == null) return null; if(result == null || result.Value == false || dbItems == null) return null;
MarkdownPipeline pipeline = new Markdig.MarkdownPipelineBuilder().UseAdvancedExtensions().Build();
return dbItems return dbItems
.Where(t => t.Name.StartsWith(new string(letter, 1), StringComparison.InvariantCultureIgnoreCase)) .Where(t => t.Name.StartsWith(new string(letter, 1), StringComparison.InvariantCultureIgnoreCase))
@@ -145,7 +149,7 @@ namespace cicm_web.Models
Website = t.Website, Website = t.Website,
Logos = t.Logos, Logos = t.Logos,
LastLogo = t.LastLogo, LastLogo = t.LastLogo,
Description = t.Description Description = t.Description == null ? null : Markdig.Markdown.ToHtml(t.Description, pipeline)
}).OrderBy(t => t.Name).ToArray(); }).OrderBy(t => t.Name).ToArray();
} }
} }

3
cicm_web/Views/Company/View.cshtml
View File

@@ -33,6 +33,7 @@
} }
@using System.IO @using System.IO
@using Cicm.Database.Schemas @using Cicm.Database.Schemas
@using Markdig
@model CompanyWithItems @model CompanyWithItems
@if(Model != null) @if(Model != null)
@@ -431,7 +432,7 @@
@if(Model.Description != null) @if(Model.Description != null)
{ {
<div class="row container-fluid"> <div class="row container-fluid">
@Model.Description @Html.Raw(Model.Description)
</div> </div>
} }
</div> </div>

3
cicm_web/cicm_web.csproj
View File

@@ -2,7 +2,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web"> <Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp2.0</TargetFramework> <TargetFramework>netcoreapp2.0</TargetFramework>
<Version>3.0.99.150</Version> <Version>3.0.99.153</Version>
<Company>Canary Islands Computer Museum</Company> <Company>Canary Islands Computer Museum</Company>
<Copyright>Copyright © 2003-2018 Natalia Portillo</Copyright> <Copyright>Copyright © 2003-2018 Natalia Portillo</Copyright>
<Product>Canary Islands Computer Museum Website</Product> <Product>Canary Islands Computer Museum Website</Product>
@@ -14,6 +14,7 @@
<NrtShowRevision>true</NrtShowRevision> <NrtShowRevision>true</NrtShowRevision>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Markdig" Version="0.15.0" />
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.6" /> <PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.6" />
<PackageReference Include="Microsoft.NETCore.App" Version="2.0.6" /> <PackageReference Include="Microsoft.NETCore.App" Version="2.0.6" />
<PackageReference Include="MSBump" Version="2.3.2" PrivateAssets="All" /> <PackageReference Include="MSBump" Version="2.3.2" PrivateAssets="All" />