* Web.csproj:
* TexToPdfFormatter.cs: Pdf formatter from Tex string * FrontOfficeApiController.cs: html response in case of no document to produce at billing * Estimate.aspx: renamed the Http methods returning tex and pdf estimates * LocalizedText.Designer.cs: these files are generated from the .resx file * LocalizedText.resx: * LocalizedText.fr.resx: html response in case of no document to produce at billing
This commit is contained in:
parent
3dbf0265db
commit
206e16686b
7 changed files with 161 additions and 20 deletions
|
|
@ -89,11 +89,11 @@ namespace Yavsc.ApiControllers
|
||||||
/// <returns>The estim tex.</returns>
|
/// <returns>The estim tex.</returns>
|
||||||
/// <param name="estimid">Estimid.</param>
|
/// <param name="estimid">Estimid.</param>
|
||||||
[AcceptVerbs ("GET")]
|
[AcceptVerbs ("GET")]
|
||||||
public HttpResponseMessage GetEstimTex (long estimid)
|
public HttpResponseMessage EstimateToTex (long estimid)
|
||||||
{
|
{
|
||||||
string texest = null;
|
string texest = null;
|
||||||
try {
|
try {
|
||||||
texest = getEstimTex (estimid);
|
texest = estimateToTex (estimid);
|
||||||
} catch (TemplateException ex) {
|
} catch (TemplateException ex) {
|
||||||
return new HttpResponseMessage (HttpStatusCode.OK) { Content =
|
return new HttpResponseMessage (HttpStatusCode.OK) { Content =
|
||||||
new ObjectContent (typeof(string),
|
new ObjectContent (typeof(string),
|
||||||
|
|
@ -102,16 +102,17 @@ namespace Yavsc.ApiControllers
|
||||||
))
|
))
|
||||||
};
|
};
|
||||||
} catch (Exception ex) {
|
} catch (Exception ex) {
|
||||||
|
|
||||||
return new HttpResponseMessage (HttpStatusCode.OK) { Content =
|
return new HttpResponseMessage (HttpStatusCode.OK) { Content =
|
||||||
new ObjectContent (typeof(string),
|
new ObjectContent (typeof(string),
|
||||||
ex.Message, new SimpleFormatter ("text/text"))
|
ex.Message, new ErrorHtmlFormatter (HttpStatusCode.InternalServerError,
|
||||||
|
LocalizedText.DocTemplateException))
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
if (texest == null)
|
if (texest == null)
|
||||||
return new HttpResponseMessage (HttpStatusCode.OK) { Content =
|
return new HttpResponseMessage (HttpStatusCode.OK) { Content =
|
||||||
new ObjectContent (typeof(string),
|
new ObjectContent (typeof(string), "Not an estimation id:" + estimid,
|
||||||
"Not an estimation id:" + estimid, new SimpleFormatter ("text/text"))
|
new ErrorHtmlFormatter (HttpStatusCode.NotFound,
|
||||||
|
LocalizedText.Estimate_not_found))
|
||||||
};
|
};
|
||||||
|
|
||||||
return new HttpResponseMessage () {
|
return new HttpResponseMessage () {
|
||||||
|
|
@ -121,7 +122,7 @@ namespace Yavsc.ApiControllers
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
private string getEstimTex (long estimid)
|
private string estimateToTex (long estimid)
|
||||||
{
|
{
|
||||||
Yavsc.templates.Estim tmpe = new Yavsc.templates.Estim ();
|
Yavsc.templates.Estim tmpe = new Yavsc.templates.Estim ();
|
||||||
Estimate e = wfmgr.GetEstimate (estimid);
|
Estimate e = wfmgr.GetEstimate (estimid);
|
||||||
|
|
@ -141,22 +142,42 @@ namespace Yavsc.ApiControllers
|
||||||
return tmpe.TransformText ();
|
return tmpe.TransformText ();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets the estimate in pdf format from tex generation.
|
/// Gets the estimate in pdf format from tex generation.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <returns>The estim pdf.</returns>
|
/// <returns>The to pdf.</returns>
|
||||||
/// <param name="estimid">Estimid.</param>
|
/// <param name="estimid">Estimid.</param>
|
||||||
public HttpResponseMessage GetEstimPdf (long estimid)
|
[AcceptVerbs("GET")]
|
||||||
|
public HttpResponseMessage EstimateToPdf (long estimid)
|
||||||
{
|
{
|
||||||
Estimate estim = wfmgr.GetEstimate (estimid);
|
string texest = null;
|
||||||
//TODO better with pro.IsBankable && cli.IsBillable
|
try {
|
||||||
|
texest = estimateToTex (estimid);
|
||||||
|
} catch (TemplateException ex) {
|
||||||
|
return new HttpResponseMessage (HttpStatusCode.OK) { Content =
|
||||||
|
new ObjectContent (typeof(string),
|
||||||
|
ex.Message, new ErrorHtmlFormatter (HttpStatusCode.NotAcceptable,
|
||||||
|
LocalizedText.DocTemplateException
|
||||||
|
))
|
||||||
|
};
|
||||||
|
} catch (Exception ex) {
|
||||||
|
return new HttpResponseMessage (HttpStatusCode.OK) { Content =
|
||||||
|
new ObjectContent (typeof(string),
|
||||||
|
ex.Message, new ErrorHtmlFormatter (HttpStatusCode.InternalServerError,
|
||||||
|
LocalizedText.DocTemplateException))
|
||||||
|
};
|
||||||
|
}
|
||||||
|
if (texest == null)
|
||||||
|
return new HttpResponseMessage (HttpStatusCode.OK) { Content =
|
||||||
|
new ObjectContent (typeof(string), "Not an estimation id:" + estimid,
|
||||||
|
new ErrorHtmlFormatter (HttpStatusCode.NotFound,
|
||||||
|
LocalizedText.Estimate_not_found))
|
||||||
|
};
|
||||||
|
|
||||||
return new HttpResponseMessage () {
|
return new HttpResponseMessage () {
|
||||||
Content = new ObjectContent (
|
Content = new ObjectContent (typeof(string),
|
||||||
typeof(Estimate),
|
texest,
|
||||||
estim,
|
new TexToPdfFormatter ())
|
||||||
new EstimToPdfFormatter ())
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
110
web/Formatters/TexToPdfFormatter.cs
Normal file
110
web/Formatters/TexToPdfFormatter.cs
Normal file
|
|
@ -0,0 +1,110 @@
|
||||||
|
//
|
||||||
|
// TexToPdfFormatter.cs
|
||||||
|
//
|
||||||
|
// Author:
|
||||||
|
// Paul Schneider <paulschneider@free.fr>
|
||||||
|
//
|
||||||
|
// Copyright (c) 2015 Paul Schneider
|
||||||
|
//
|
||||||
|
// This program is free software: you can redistribute it and/or modify
|
||||||
|
// it under the terms of the GNU Lesser General Public License as published by
|
||||||
|
// the Free Software Foundation, either version 3 of the License, or
|
||||||
|
// (at your option) any later version.
|
||||||
|
//
|
||||||
|
// This program is distributed in the hope that it will be useful,
|
||||||
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
// GNU Lesser General Public License for more details.
|
||||||
|
//
|
||||||
|
// You should have received a copy of the GNU Lesser General Public License
|
||||||
|
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
using System;
|
||||||
|
using System.Net.Http.Formatting;
|
||||||
|
using System.Net.Http.Headers;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.IO;
|
||||||
|
using System.Web;
|
||||||
|
using System.Diagnostics;
|
||||||
|
|
||||||
|
namespace Yavsc.Formatters
|
||||||
|
{
|
||||||
|
public class TexToPdfFormatter: BufferedMediaTypeFormatter
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Initializes a new instance of the <see cref="Yavsc.Formatters.TexToPdfFormatter"/> class.
|
||||||
|
/// </summary>
|
||||||
|
public TexToPdfFormatter ()
|
||||||
|
{
|
||||||
|
SupportedMediaTypes.Add(new MediaTypeHeaderValue("text/pdf"));
|
||||||
|
}
|
||||||
|
/// <summary>
|
||||||
|
/// Determines whether this instance can read type the specified type.
|
||||||
|
/// </summary>
|
||||||
|
/// <returns><c>true</c> if this instance can read type the specified type; otherwise, <c>false</c>.</returns>
|
||||||
|
/// <param name="type">Type.</param>
|
||||||
|
public override bool CanReadType(Type type)
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
/// <summary>
|
||||||
|
/// Determines whether this instance can write type the specified type.
|
||||||
|
/// </summary>
|
||||||
|
/// <returns><c>true</c> if this instance can write type the specified type; otherwise, <c>false</c>.</returns>
|
||||||
|
/// <param name="type">Type.</param>
|
||||||
|
public override bool CanWriteType(System.Type type)
|
||||||
|
{
|
||||||
|
if (type == typeof(string))
|
||||||
|
{
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
Type enumerableType = typeof(IEnumerable<string>);
|
||||||
|
return enumerableType.IsAssignableFrom(type);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
/// <summary>
|
||||||
|
/// Writes to stream.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="type">Type.</param>
|
||||||
|
/// <param name="value">Value.</param>
|
||||||
|
/// <param name="stream">Stream.</param>
|
||||||
|
/// <param name="contentHeaders">Content headers.</param>
|
||||||
|
public override void WriteToStream (Type type, object value, Stream stream, HttpContentHeaders contentHeaders)
|
||||||
|
{
|
||||||
|
|
||||||
|
string content = value as string;
|
||||||
|
string name = "tmpdoc-"+Guid.NewGuid().ToString();
|
||||||
|
string fullname = Path.Combine (
|
||||||
|
HttpRuntime.CodegenDir, name);
|
||||||
|
FileInfo fi = new FileInfo(fullname + ".tex");
|
||||||
|
FileInfo fo = new FileInfo(fullname + ".pdf");
|
||||||
|
using (StreamWriter sw = new StreamWriter (fi.FullName))
|
||||||
|
{
|
||||||
|
sw.Write (content);
|
||||||
|
}
|
||||||
|
using (Process p = new Process ()) {
|
||||||
|
p.StartInfo.WorkingDirectory = HttpRuntime.CodegenDir;
|
||||||
|
p.StartInfo = new ProcessStartInfo ();
|
||||||
|
p.StartInfo.UseShellExecute = false;
|
||||||
|
p.StartInfo.FileName = "/usr/bin/texi2pdf";
|
||||||
|
p.StartInfo.Arguments =
|
||||||
|
string.Format ("--batch --build-dir={2} -o {0} {1}",
|
||||||
|
fo.FullName,
|
||||||
|
fi.FullName,HttpRuntime.CodegenDir);
|
||||||
|
p.Start ();
|
||||||
|
p.WaitForExit ();
|
||||||
|
if (p.ExitCode != 0)
|
||||||
|
throw new Exception ("Pdf generation failed with exit code:" + p.ExitCode);
|
||||||
|
}
|
||||||
|
|
||||||
|
using (StreamReader sr = new StreamReader (fo.FullName)) {
|
||||||
|
byte[] buffer = File.ReadAllBytes (fo.FullName);
|
||||||
|
stream.Write(buffer,0,buffer.Length);
|
||||||
|
}
|
||||||
|
fi.Delete();
|
||||||
|
fo.Delete();
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -54,6 +54,11 @@
|
||||||
</table>
|
</table>
|
||||||
<% } %>
|
<% } %>
|
||||||
<% } %>
|
<% } %>
|
||||||
|
|
||||||
|
<aside>
|
||||||
|
<a class="actionlink" href="<%=ViewData["WebApiBase"]%>/FrontOffice/EstimateToTex?estimid=<%=Model.Id%>"><%= LocalizedText.Tex_version %></a>
|
||||||
|
<a class="actionlink" href="<%=ViewData["WebApiBase"]%>/FrontOffice/EstimateToPdf?estimid=<%=Model.Id%>"><%= LocalizedText.Pdf_version %></a>
|
||||||
|
</aside>
|
||||||
</asp:Content>
|
</asp:Content>
|
||||||
<asp:Content ContentPlaceHolderID="MASContent" ID="MASContent1" runat="server">
|
<asp:Content ContentPlaceHolderID="MASContent" ID="MASContent1" runat="server">
|
||||||
|
|
||||||
|
|
@ -241,10 +246,6 @@ function addRow(){
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
|
||||||
<div>
|
|
||||||
<a class="actionlink" href="<%=ViewData["WebApiBase"]%>/FrontOffice/GetEstimTex?estimid=<%=Model.Id%>"><%= LocalizedText.Tex_version %></a>
|
|
||||||
<a class="actionlink" href="<%=ViewData["WebApiBase"]%>/FrontOffice/GetEstimPdf?estimid=<%=Model.Id%>"><%= LocalizedText.Pdf_version %></a>
|
|
||||||
</div>
|
|
||||||
</asp:Content>
|
</asp:Content>
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -184,6 +184,7 @@
|
||||||
<Compile Include="Formatters\ErrorHtmlFormatter.cs" />
|
<Compile Include="Formatters\ErrorHtmlFormatter.cs" />
|
||||||
<Compile Include="Formatters\RssFeedsFormatter.cs" />
|
<Compile Include="Formatters\RssFeedsFormatter.cs" />
|
||||||
<Compile Include="Controllers\PaypalApiController.cs" />
|
<Compile Include="Controllers\PaypalApiController.cs" />
|
||||||
|
<Compile Include="Formatters\TexToPdfFormatter.cs" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Content Include="Views\Web.config" />
|
<Content Include="Views\Web.config" />
|
||||||
|
|
|
||||||
6
yavscModel/LocalizedText.Designer.cs
generated
6
yavscModel/LocalizedText.Designer.cs
generated
|
|
@ -160,6 +160,12 @@ namespace Yavsc.Model {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static string Estimate_not_found {
|
||||||
|
get {
|
||||||
|
return ResourceManager.GetString("Estimate_not_found", resourceCulture);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public static string Online {
|
public static string Online {
|
||||||
get {
|
get {
|
||||||
return ResourceManager.GetString("Online", resourceCulture);
|
return ResourceManager.GetString("Online", resourceCulture);
|
||||||
|
|
|
||||||
|
|
@ -46,4 +46,5 @@
|
||||||
<data name="younotadmin"><value>Vous n'êtes pas administrateur</value></data>
|
<data name="younotadmin"><value>Vous n'êtes pas administrateur</value></data>
|
||||||
<data name="role_created"><value>Rôle créé</value></data>
|
<data name="role_created"><value>Rôle créé</value></data>
|
||||||
<data name="Item_added_to_basket"><value>Article ajouté au panier</value></data>
|
<data name="Item_added_to_basket"><value>Article ajouté au panier</value></data>
|
||||||
|
<data name="Estimate_not_found"><value>Devis non trouvé</value></data>
|
||||||
</root>
|
</root>
|
||||||
|
|
|
||||||
|
|
@ -46,4 +46,5 @@
|
||||||
<data name="younotadmin"><value>You're not administrator</value></data>
|
<data name="younotadmin"><value>You're not administrator</value></data>
|
||||||
<data name="role_created"><value>role created</value></data>
|
<data name="role_created"><value>role created</value></data>
|
||||||
<data name="Item_added_to_basket"><value>Item added to basket</value></data>
|
<data name="Item_added_to_basket"><value>Item added to basket</value></data>
|
||||||
|
<data name="Estimate_not_found"><value>Estimate not found</value></data>
|
||||||
</root>
|
</root>
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue