Egalware/C2P
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vers 2.0.147

Browse Source 
- aggiornata e gestita registrazione utente (con plain key)
...continuo testing...
This commit is contained in:
Samuele E. Locatelli
2014-11-03 14:30:53 +01:00
parent 3df613ab87
commit 31b40d3166
21 changed files with 190 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
C2P/C2P.csproj
+8
View File
@@ -227,6 +227,7 @@
<Content Include="fonts\glyphicons-halflings-regular.svg" />
<Content Include="help\EN\index.html" />
<Content Include="help\IT\index.html" />
<Content Include="Home.aspx" />
<Content Include="Images\accent.png" />
<Content Include="Images\AdminArea.png" />
<Content Include="Images\apply_l.png" />
@@ -516,6 +517,13 @@
<Compile Include="Global.asax.cs">
<DependentUpon>Global.asax</DependentUpon>
</Compile>
<Compile Include="Home.aspx.cs">
<DependentUpon>Home.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="Home.aspx.designer.cs">
<DependentUpon>Home.aspx</DependentUpon>
</Compile>
<Compile Include="JumboPage.master.cs">
<DependentUpon>JumboPage.master</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
C2P/C2P.csproj.user
+1 -1
View File
@@ -2,7 +2,7 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ProjectView>ShowAllFiles</ProjectView>
<NameOfLastUsedPublishProfile>costimateZip</NameOfLastUsedPublishProfile>
<NameOfLastUsedPublishProfile>IIS02</NameOfLastUsedPublishProfile>
</PropertyGroup>
<ProjectExtensions>
<VisualStudio>
C2P/Default.aspx
-10
View File
@@ -1,15 +1,5 @@
<%@ Page Title="Home Page" Language="C#" MasterPageFile="~/JumboPage.Master" AutoEventWireup="true" CodeBehind="Default.aspx.cs" Inherits="C2P._Default" %>
<%--
<section class="featured">
<div class="content-wrapper">
<hgroup class="title">
<h1>C2P = Cost 2 Price<%: Title %></h1>
</hgroup>
Generazione preventivi, Simulazione, Report di campagna
</div>
</section>
--%>
<asp:Content runat="server" ID="FeaturedContent" ContentPlaceHolderID="FeaturedContent">
<div class="row" style="margin-top: -10px;">
<div class="col-xs-5">
C2P/Default.aspx.cs
+1 -1
View File
@@ -14,7 +14,7 @@ namespace C2P
{
// resetto i dati utente all'accesso alla pagina default...
devicesAuthProxy.stObj.clearAllUserData();
Response.Redirect("UserAdmin");
Response.Redirect("Home");
}
}
}
C2P/Home.aspx
+46
View File
@@ -0,0 +1,46 @@
<%@ Page Title="" Language="C#" MasterPageFile="~/JumboPage.master" AutoEventWireup="true" CodeBehind="Home.aspx.cs" Inherits="C2P.Home" %>
<asp:Content runat="server" ID="FeaturedContent" ContentPlaceHolderID="FeaturedContent">
<div class="row" style="margin-top: -10px;">
<div class="col-xs-5">
<div style="color: #ee8800; margin-top: 60px;">
<img src="Images/LogoCostimate.png?h=121&w=458&mode=max" alt="Costimate" class="img-responsive" />
</div>
<p>Cost to Price for Extrusion</p>
</div>
<div class="col-xs-6 col-xs-offset-1 text-right" style="margin-top: 10px;">
<img src="Images/extrusion.png" alt="" class="img-responsive" /></div>
</div>
</asp:Content>
<asp:Content runat="server" ID="BodyContent" ContentPlaceHolderID="MainContent">
<div class="container marketing">
<div class="row">
<div class="col-xs-10 col-xs-offset-1">
<div class="panel panel-default">
<div class="panel-heading">
<h2 class="panel-title">Quick Shortcut</h2>
</div>
<div class="panel-body">
<div class="shortcuts">
<asp:HyperLink runat="server" ID="HyperLink2" class="shortcut" NavigateUrl="ExistingProductOffer">
<i class="fa fa-cubes shortcut-icon"></i> <span class="shortcut-label"><%: traduci("ExistProdOff") %></span>
</asp:HyperLink>
<asp:HyperLink runat="server" ID="HyperLink3" class="shortcut" NavigateUrl="NewProductOffer">
<i class="fa fa-cube shortcut-icon"></i> <span class="shortcut-label"><%: traduci("NewProdOff") %></span>
</asp:HyperLink>
<asp:HyperLink runat="server" ID="HyperLink4" class="shortcut" NavigateUrl="OffersArchive">
<i class="fa fa-database shortcut-icon"></i> <span class="shortcut-label"><%: traduci("OffersArchive") %></span>
</asp:HyperLink>
<asp:HyperLink runat="server" ID="HyperLink5" class="shortcut" NavigateUrl="MarginReport">
<i class="fa fa-eur shortcut-icon"></i> <span class="shortcut-label"><%: traduci("MarginReport") %></span>
</asp:HyperLink>
<asp:HyperLink runat="server" ID="HyperLink6" class="shortcut" NavigateUrl="StdCostList">
<i class="fa fa-calculator shortcut-icon"></i> <span class="shortcut-label"><%: traduci("StdCostList") %></span>
</asp:HyperLink>
</div>
</div>
</div>
</div>
</div>
</div>
</asp:Content>
C2P/Home.aspx.cs
+18
View File
@@ -0,0 +1,18 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
using SteamWare;
namespace C2P
{
public partial class Home : SteamWare.UserPage
{
protected void Page_Load(object sender, EventArgs e)
{
}
}
}
C2P/Home.aspx.designer.cs
Generated
+60
View File
@@ -0,0 +1,60 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
namespace C2P {
public partial class Home {
/// <summary>
/// HyperLink2 control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.HyperLink HyperLink2;
/// <summary>
/// HyperLink3 control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.HyperLink HyperLink3;
/// <summary>
/// HyperLink4 control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.HyperLink HyperLink4;
/// <summary>
/// HyperLink5 control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.HyperLink HyperLink5;
/// <summary>
/// HyperLink6 control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.HyperLink HyperLink6;
}
}
C2P/Properties/PublishProfiles/costimate.pubxml
+10
View File
@@ -31,6 +31,16 @@ by editing this MSBuild file. In order to learn more about this please visit htt
<Source MatchValue="Data Source=10.74.82.217\SQL2008R2;Initial Catalog=Proxima_C2P;Persist Security Info=True;User ID=sa;Password=keyhammer" MatchAttributes="$(UpdateFromConnectionStringAttributes)" />
</UpdateFrom>
</ObjectGroup>
<ObjectGroup Name="SteamWare.Properties.Settings.DS_AuthConnectionString" Order="2" Enabled="False">
<Destination Path="" />
<Object Type="DbDacFx">
<PreSource Path="Data Source=10.74.82.217\SQL2008R2;Initial Catalog=Proxima_C2P;Persist Security Info=True;User ID=sa;Password=keyhammer" includeData="False" />
<Source Path="$(IntermediateOutputPath)AutoScripts\SteamWare.Properties.Settings.DS_AuthConnectionString_IncrementalSchemaOnly.dacpac" dacpacAction="Deploy" />
</Object>
<UpdateFrom Type="Web.Config">
<Source MatchValue="Data Source=10.74.82.217\SQL2008R2;Initial Catalog=Proxima_C2P;Persist Security Info=True;User ID=sa;Password=keyhammer" MatchAttributes="$(UpdateFromConnectionStringAttributes)" />
</UpdateFrom>
</ObjectGroup>
</Objects>
</PublishDatabaseSettings>
</PropertyGroup>
C2P/Properties/PublishProfiles/costimateZip.pubxml
+10
View File
@@ -26,6 +26,16 @@ by editing this MSBuild file. In order to learn more about this please visit htt
<Source MatchValue="Data Source=10.74.82.217\SQL2008R2;Initial Catalog=Proxima_C2P;Persist Security Info=True;User ID=sa;Password=keyhammer" MatchAttributes="$(UpdateFromConnectionStringAttributes)" />
</UpdateFrom>
</ObjectGroup>
<ObjectGroup Name="SteamWare.Properties.Settings.DS_AuthConnectionString" Order="2" Enabled="False">
<Destination Path="" />
<Object Type="DbDacFx">
<PreSource Path="Data Source=10.74.82.217\SQL2008R2;Initial Catalog=Proxima_C2P;Persist Security Info=True;User ID=sa;Password=keyhammer" includeData="False" />
<Source Path="$(IntermediateOutputPath)AutoScripts\SteamWare.Properties.Settings.DS_AuthConnectionString_IncrementalSchemaOnly.dacpac" dacpacAction="Deploy" />
</Object>
<UpdateFrom Type="Web.Config">
<Source MatchValue="Data Source=10.74.82.217\SQL2008R2;Initial Catalog=Proxima_C2P;Persist Security Info=True;User ID=sa;Password=keyhammer" MatchAttributes="$(UpdateFromConnectionStringAttributes)" />
</UpdateFrom>
</ObjectGroup>
</Objects>
</PublishDatabaseSettings>
<PrecompileBeforePublish>True</PrecompileBeforePublish>
C2P/Web.config
+1 -1
View File
@@ -26,7 +26,7 @@
<add key="defaultDomain" value="#WINLAB#" />
<!--gestione auth dispositivi-->
<add key="defaultDomain" value="steamwarewin" />
<add key="enablePlain" value="true"/>
<add key="enablePlain" value="false"/>
<add key="urlGestUtenti" value="UserAdmin"/>
<add key="adminEmail" value="samuele@steamware.net"/>
<add key="PageNoIndex" value="UserAdmin#Test" />
C2P/WebUserControls/mod_testata.ascx.cs
+31 -45
View File
@@ -56,61 +56,47 @@ namespace C2P.WebUserControls
/// <param name="e"></param>
protected void Page_Load(object sender, EventArgs e)
{
if (true)
// altri controlli
if (!Page.IsPostBack)
{
// altri controlli
if (!Page.IsPostBack)
Page.Title = Request.Url.ToString();
// se ho cambiato pagina registro...)
if (devicesAuthProxy.pagPrecedente != titolo)
{
Page.Title = Request.Url.ToString();
// se ho cambiato pagina registro...)
if (devicesAuthProxy.pagPrecedente != titolo)
{
devicesAuthProxy.pagPrecedente = devicesAuthProxy.pagCorrente;
}
// salvo apgina corrente
devicesAuthProxy.pagCorrente = titolo; // devicesAuthProxy.getCurrPage(Request.Url);
devicesAuthProxy.pagPrecedente = devicesAuthProxy.pagCorrente;
}
// SOLO se la pagina NON E' "safe"...
if (memLayer.ML.confReadString("PageNoIndex").IndexOf(titolo) < 0)
// salvo apgina corrente
devicesAuthProxy.pagCorrente = titolo;
// fix logo
imgLogo.Visible = logoVisible;
PagCorrente();
memLayer.ML.emptySessionVal("searchVal");
}
// SOLO se la pagina NON E' "safe"...
if (memLayer.ML.confReadString("PageNoIndex").IndexOf(titolo) < 0)
{
bool userOk = checkUser();
bool pageOk = checkPageIsAuth();
// controllo se c'è utente in sessione..
if ((userOk))
{
bool userOk = checkUser();
bool pageOk = checkPageIsAuth();
// controllo se c'è utente in sessione..
if ((userOk))
// ora controllo pagina...
if (!pageOk)
{
// ora controllo pagina...
if (!pageOk)
if (devicesAuthProxy.stObj.isPageEnabled(devicesAuthProxy.pagPrecedente))
{
if (devicesAuthProxy.stObj.isPageEnabled(devicesAuthProxy.pagPrecedente))
{
Response.Redirect(devicesAuthProxy.pagPrecedente);
}
else
{
Response.Redirect("Default");
}
Response.Redirect(devicesAuthProxy.pagPrecedente);
}
else
{
Response.Redirect("Home");
}
}
else
{
// rimando pagina x registrazione devices
Response.Redirect("UserAdmin");
}
}
}
else
{
// se l'utente NON c'è torno a login...
if (!user_std.UtSn.isAuth && currPage.IndexOf("login") < 0)
else
{
Session["nextPage"] = currPage;
Response.Redirect("login");
}
if (!Page.IsPostBack)
{
imgLogo.Visible = logoVisible;
PagCorrente();
memLayer.ML.emptySessionVal("searchVal");
// rimando pagina x registrazione devices
Response.Redirect("UserAdmin");
}
}
}
C2P/bin/C2P.dll
BIN
View File
Binary file not shown.
C2P/bin/C2P_Data.dll
BIN
View File
Binary file not shown.
C2P/bin/SteamWare.dll
BIN
View File
Binary file not shown.
C2P_Data/bin/Release/C2P_Data.dll
BIN
View File
Binary file not shown.
C2P_Data/bin/Release/SteamWare.dll
BIN
View File
Binary file not shown.
C2P_Report/bin/C2P_Data.dll
BIN
View File
Binary file not shown.
C2P_Report/bin/C2P_Report.dll
BIN
View File
Binary file not shown.
C2P_Report/bin/SteamWare.dll
BIN
View File
Binary file not shown.
VersGen/C2P.cs
+2 -2
View File
@@ -5,7 +5,7 @@
using System.Reflection;
[assembly: AssemblyVersion("2.0.146.333")]
[assembly: AssemblyFileVersion("2.0.146.333")]
[assembly: AssemblyVersion("2.0.147.337")]
[assembly: AssemblyFileVersion("2.0.147.337")]
[assembly: AssemblyCopyright("Proxima & Steamware © 2013-2014")]
[assembly: AssemblyCompany("Steamware")]
VersGen/C2P.tt
+2 -2
View File
@@ -6,8 +6,8 @@
using System.Reflection;
[assembly: AssemblyVersion("2.0.146.<#= this.RevisionNumber #>")]
[assembly: AssemblyFileVersion("2.0.146.<#= this.RevisionNumber #>")]
[assembly: AssemblyVersion("2.0.147.<#= this.RevisionNumber #>")]
[assembly: AssemblyFileVersion("2.0.147.<#= this.RevisionNumber #>")]
[assembly: AssemblyCopyright("Proxima & Steamware © 2013-<#= DateTime.Now.Year #>")]
[assembly: AssemblyCompany("Steamware")]
<#+