From b296e744bb131d8d99237717c810f0aca18643fe Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Tue, 20 Dec 2016 12:55:18 +0100 Subject: [PATCH] completata prima review, da creare/testare pacchetti deploy x IIS01/02 e Donati --- .vs/MP/v14/.suo | Bin 127488 -> 127488 bytes MP/Controllers/HomeController.cs | 22 ++++++++++++-- MP/MP.csproj | 43 +++++++++++++++++++++++++-- MP/Models/MPModel.Context.cs | 20 +++++++++++++ MP/Models/MPModel.edmx | 20 +++++++++++-- MP/Models/stp_AKV_getByKey_Result.cs | 22 ++++++++++++++ MP/Views/Home/About.cshtml | 3 +- MP/Views/Home/Contact.cshtml | 43 ++++++++++++++++++++------- MP/Views/Home/Index.cshtml | 12 ++++---- 9 files changed, 159 insertions(+), 26 deletions(-) create mode 100644 MP/Models/stp_AKV_getByKey_Result.cs diff --git a/.vs/MP/v14/.suo b/.vs/MP/v14/.suo index 87cd2813d7516f848d910b5fc81c4cbd19269955..f7735d9d712581220608993f6851b43a2a4ce570 100644 GIT binary patch delta 5703 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 JH{OQ0{{k&mXx9J$ delta 8962 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 + ViewBag.Environment = keyVal[0].valString; + // imposto URL dei vari siti + ViewBag.UrlMpSite = ctx.stp_AKV_getByKey("UrlMpSite").ToList()[0].valString; + ViewBag.UrlMpAdmin = ctx.stp_AKV_getByKey("UrlMpAdmin").ToList()[0].valString; + ViewBag.UrlMpIO = ctx.stp_AKV_getByKey("UrlMpIO").ToList()[0].valString; + ViewBag.UrlMpMON = ctx.stp_AKV_getByKey("UrlMpMON").ToList()[0].valString; + ViewBag.UrlMpTAB = ctx.stp_AKV_getByKey("UrlMpTAB").ToList()[0].valString; + } return View(); } public ActionResult About() { - ViewBag.Message = "Your application description page."; + ViewBag.Title = "MoonPro"; + ViewBag.Message = "MoonPro è il motore software di MAPO, la nostra soluzione hardware"; return View(); } public ActionResult Contact() { - ViewBag.Message = "Your contact page."; + ViewBag.Title = "MoonPro"; + ViewBag.Message = "Per contattarci"; return View(); } diff --git a/MP/MP.csproj b/MP/MP.csproj index 403e843e..4271095f 100644 --- a/MP/MP.csproj +++ b/MP/MP.csproj @@ -136,8 +136,27 @@ Global.asax - - + + MPModel.tt + + + True + True + MPModel.Context.tt + + + True + True + MPModel.tt + + + True + True + MPModel.edmx + + + MPModel.tt + @@ -167,11 +186,28 @@ + + EntityModelCodeGenerator + MPModel.Designer.cs + + + MPModel.edmx + + + TextTemplatingFileGenerator + MPModel.edmx + MPModel.Context.cs + + + TextTemplatingFileGenerator + MPModel.edmx + MPModel.cs + @@ -218,6 +254,9 @@ MapoDb + + + 10.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) diff --git a/MP/Models/MPModel.Context.cs b/MP/Models/MPModel.Context.cs index 41e0e7f5..fe076128 100644 --- a/MP/Models/MPModel.Context.cs +++ b/MP/Models/MPModel.Context.cs @@ -12,6 +12,8 @@ namespace MP.Models using System; using System.Data.Entity; using System.Data.Entity.Infrastructure; + using System.Data.Entity.Core.Objects; + using System.Linq; public partial class MoonProEntities : DbContext { @@ -26,5 +28,23 @@ namespace MP.Models } public virtual DbSet AnagKeyValue { get; set; } + + public virtual ObjectResult stp_AKV_getByKey(string nomeVar) + { + var nomeVarParameter = nomeVar != null ? + new ObjectParameter("nomeVar", nomeVar) : + new ObjectParameter("nomeVar", typeof(string)); + + return ((IObjectContextAdapter)this).ObjectContext.ExecuteFunction("stp_AKV_getByKey", nomeVarParameter); + } + + public virtual ObjectResult stp_AKV_getByKey(string nomeVar, MergeOption mergeOption) + { + var nomeVarParameter = nomeVar != null ? + new ObjectParameter("nomeVar", nomeVar) : + new ObjectParameter("nomeVar", typeof(string)); + + return ((IObjectContextAdapter)this).ObjectContext.ExecuteFunction("stp_AKV_getByKey", mergeOption, nomeVarParameter); + } } } diff --git a/MP/Models/MPModel.edmx b/MP/Models/MPModel.edmx index 727db01c..cf23428a 100644 --- a/MP/Models/MPModel.edmx +++ b/MP/Models/MPModel.edmx @@ -4,7 +4,7 @@ - + @@ -15,11 +15,13 @@ + + + - - + @@ -35,7 +37,17 @@ + + + + + + + + + + @@ -53,6 +65,8 @@ + + diff --git a/MP/Models/stp_AKV_getByKey_Result.cs b/MP/Models/stp_AKV_getByKey_Result.cs new file mode 100644 index 00000000..d4f458b0 --- /dev/null +++ b/MP/Models/stp_AKV_getByKey_Result.cs @@ -0,0 +1,22 @@ +//------------------------------------------------------------------------------ +// +// This code was generated from a template. +// +// Manual changes to this file may cause unexpected behavior in your application. +// Manual changes to this file will be overwritten if the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace MP.Models +{ + using System; + + public partial class stp_AKV_getByKey_Result + { + public string nomeVar { get; set; } + public int valInt { get; set; } + public double valFloat { get; set; } + public string valString { get; set; } + public string descrizione { get; set; } + } +} diff --git a/MP/Views/Home/About.cshtml b/MP/Views/Home/About.cshtml index 4b2d9e84..b840c0a1 100644 --- a/MP/Views/Home/About.cshtml +++ b/MP/Views/Home/About.cshtml @@ -4,4 +4,5 @@

@ViewBag.Title.

@ViewBag.Message

-

Use this area to provide additional information.

+

MoonPro / MAPO sono una suite di applicazioni e dispositivi hw dedicati per l'IOT,l'industry 4.0 e la gestione automatizzata dei processi produttivi.

+

Per maggiori informazioni visita il link sul nostro sito.

diff --git a/MP/Views/Home/Contact.cshtml b/MP/Views/Home/Contact.cshtml index 0f4327e7..ee367440 100644 --- a/MP/Views/Home/Contact.cshtml +++ b/MP/Views/Home/Contact.cshtml @@ -4,14 +4,35 @@

@ViewBag.Title.

@ViewBag.Message

-
- One Microsoft Way
- Redmond, WA 98052-6399
- P: - 425.555.0100 -
- -
- Support: Support@example.com
- Marketing: Marketing@example.com -
\ No newline at end of file +
+
+

Sede Operativa

+
+ Steamware s.r.l.
+ via Dante Alighieri, 16
+ 24068 Seriate - BG
+ P: + 035.290178
+ P: + 035.460560 +
+
+
+

Sede Legale

+
+ Steamware s.r.l.
+ via Briolo Fuori, 27
+ 24015 San Giovanni Bianco - BG
+ VAT:03274190168 +
+
+
+

Supporto

+
+ Web:
+ Accedi al supporto dal nostro sito web
+ Email:
+ Scrivi un email a info at steamware.net +
+
+
diff --git a/MP/Views/Home/Index.cshtml b/MP/Views/Home/Index.cshtml index edcad828..7c1a7096 100644 --- a/MP/Views/Home/Index.cshtml +++ b/MP/Views/Home/Index.cshtml @@ -3,7 +3,7 @@ }
-

MoonPro suite - @ViewBag.Environment

+

MoonPro - @ViewBag.Environment

Pannello di gestione della suite IOT MoonPro per l'acquisizione dei dati dai sistemi MAPO

Utilizzare i link seguenti per accedere agli applicativi

@*

Learn more »

*@ @@ -11,7 +11,7 @@
- +

MP-SITE »


@@ -26,7 +26,7 @@

- +

MP-TAB »


@@ -41,7 +41,7 @@

- +

MP-ADMIN »


@@ -55,7 +55,7 @@

- +

MP-MON »


@@ -67,7 +67,7 @@



- +

MP-IO »