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

Fix auth x utente base/supervisore/admin (cambiati anche nomi ruoli in DB

Browse Source
This commit is contained in:
Samuele E. Locatelli
2015-09-18 12:23:07 +02:00
parent 13b340a448
commit b6404e12e1
16 changed files with 47 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMS-SC-Data/bin/Release/CMS-SC-Data.dll
BIN
View File
Binary file not shown.
CMS-SC-Data/bin/Release/SteamWare.dll
BIN
View File
Binary file not shown.
CMS-SC-Data/obj/Release/CMS-SC-Data.dll
BIN
View File
Binary file not shown.
CMS-SC-Data/obj/Release/TempPE/DS_Applicazione.Designer.cs.dll
BIN
View File
Binary file not shown.
CMS_SC/ElencoSchede.aspx
+22 -22
View File
@@ -22,43 +22,43 @@
<uc1:mod_elencoDossiers runat="server" ID="mod_elencoDossiers" />
</div>
<div class="col-xs-8 bg-info" runat="server" id="divDetail">
<div class="row panel panel-default" style="margin: 4px; padding: 4px;">
<div class="row panel panel-default" style="margin: 4px; padding: 0px;">
<div class="panel-heading">
<div class="row" style="font-size: 0.8em; margin: 4px 0px;">
<div class="col-xs-4">
<asp:HyperLink runat="server" Target="_blank" ID="hlShowReportFull" CssClass="btn btn-info" Text='' Width="80%">
<i class="fa fa-file-o"></i> <%: traduci("btnShowReportFull") %>
</asp:HyperLink>
<asp:HyperLink runat="server" Target="_blank" ID="hlShowReportFull" CssClass="btn btn-info" Text='' Width="80%"> <i class="fa fa-file-o"></i><%: traduci("btnShowReportFull") %></asp:HyperLink>
</div>
<div class="col-xs-4">
<asp:HyperLink runat="server" Target="_blank" ID="hlShowReportComp" CssClass="btn btn-info" Width="80%">
<i class="fa fa-file-o"></i> <%: traduci("btnShowReportComp") %>
</asp:HyperLink>
<asp:HyperLink runat="server" Target="_blank" ID="hlShowReportComp" CssClass="btn btn-info" Width="80%"> <i class="fa fa-file-o"></i><%: traduci("btnShowReportComp") %></asp:HyperLink>
</div>
<div class="col-xs-4">
<asp:HyperLink runat="server" Target="_blank" ID="hlShowReportCli" CssClass="btn btn-info" Width="80%">
<i class="fa fa-file-o"></i> <%: traduci("btnShowReportCli") %>
</asp:HyperLink>
<asp:HyperLink runat="server" Target="_blank" ID="hlShowReportCli" CssClass="btn btn-info" Width="80%"> <i class="fa fa-file-o"></i><%: traduci("btnShowReportCli") %></asp:HyperLink>
</div>
</div>
</div>
<div class="panel-body">
<uc1:mod_dossier runat="server" ID="mod_dossier" />
<div class="row" style="font-size: 0.8em; background-color: #F5F5F5;">
<div class="col-xs-3">
<div class="panel-body" style="padding: 4px;">
<div class="row" style="margin: 4px 0px; border-bottom: 1px solid #ABABAB;">
<uc1:mod_dossier runat="server" ID="mod_dossier" />
</div>
<div class="row" style="margin: 4px 0px; font-size: 0.8em; background-color: #F5F5F5;">
<div class="col-xs-4">
<asp:DropDownList runat="server" ID="ddlSelFamMacc" DataSourceID="odsFamMacc" DataTextField="label" DataValueField="value"></asp:DropDownList>
<asp:ObjectDataSource ID="odsFamMacc" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="GetData" TypeName="CMS_SC_Data.DS_UtilityTableAdapters.v_selFamMaccTableAdapter"></asp:ObjectDataSource>
<br />
<asp:Button runat="server" ID="btnAddFromFam" CssClass="btn btn-success" Text='<%# traduci("btnAddFromFam") %>' OnClick="btnAddFromFam_Click" />
<div>
<asp:Button runat="server" ID="btnAddFromFam" CssClass="btn btn-success" Text='<%# traduci("btnAddFromFam") %>' OnClick="btnAddFromFam_Click" Enabled='<%# isWriteEnabled %>' />
</div>
</div>
<div class="col-xs-3">
<asp:Button runat="server" ID="btnInsMisFasi" CssClass="btn btn-warning" Text='<%# traduci("btnInsMisFasi") %>' OnClick="btnInsMisFasi_Click" />
</div>
<div class="col-xs-6 text-right">
<div class="col-xs-8 text-right">
<asp:DropDownList runat="server" ID="ddlSelScheda" DataSourceID="odsScheda" DataTextField="label" DataValueField="value"></asp:DropDownList>
<asp:ObjectDataSource ID="odsScheda" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="GetData" TypeName="CMS_SC_Data.DS_UtilityTableAdapters.v_selSchedaTableAdapter"></asp:ObjectDataSource>
<br />
<asp:Button runat="server" ID="btnAddFromScheda" CssClass="btn btn-success" Text='<%# traduci("btnAddFromScheda") %>' OnClick="btnAddFromScheda_Click" />
<div>
<div class="col-xs-6">
<asp:Button runat="server" ID="btnInsMisFasi" CssClass="btn btn-warning" Text='<%# traduci("btnInsMisFasi") %>' OnClick="btnInsMisFasi_Click" Enabled='<%# isWriteEnabled %>' />
</div>
<div class="col-xs-6">
<asp:Button runat="server" ID="btnAddFromScheda" CssClass="btn btn-success" Text='<%# traduci("btnAddFromScheda") %>' OnClick="btnAddFromScheda_Click" Enabled='<%# isWriteEnabled %>' />
</div>
</div>
</div>
</div>
<div class="row">
CMS_SC/ElencoSchede.aspx.cs
+1 -1
View File
@@ -9,7 +9,7 @@ using System.Web.UI.WebControls;
namespace CMS_SC
{
public partial class ElencoSchede : System.Web.UI.Page
public partial class ElencoSchede : SteamWare.UserPage
{
/// <summary>
/// caricamento pagina
CMS_SC/ElencoSchede.aspx.designer.cs
Generated
+9 -9
View File
@@ -93,15 +93,6 @@ namespace CMS_SC {
/// </remarks>
protected global::System.Web.UI.WebControls.Button btnAddFromFam;
/// <summary>
/// btnInsMisFasi 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.Button btnInsMisFasi;
/// <summary>
/// ddlSelScheda control.
/// </summary>
@@ -120,6 +111,15 @@ namespace CMS_SC {
/// </remarks>
protected global::System.Web.UI.WebControls.ObjectDataSource odsScheda;
/// <summary>
/// btnInsMisFasi 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.Button btnInsMisFasi;
/// <summary>
/// btnAddFromScheda control.
/// </summary>
CMS_SC/ToDo.txt
+6 -5
View File
@@ -4,12 +4,7 @@
- TODO's
----------------------------------------------------------------------------------------------------------------
- show/hide pannello storico schede
- Potrebbero servire schede speciali in cui i valori di Minimo e Massimo sono variabili (tolleranze variabili a FDO) -> si è deciso con Carlo di costruire delle schede con 2 valori TESTUALI + un file allegato, x cui misura 1 = valori massimi da ORDINE, misura 2 valori massimi rilevati, misura 3 OK / KO (con deroga...), misura 4 = allegato file
- in generale F1 = help del significato delle varie Icone. --> TOOLTIP
----------------------------------------------------------------------------------------------------------------
@@ -70,6 +65,7 @@ Gestione FILES
- gestione allegati tipo FILE (blob? in scheda o "generale"?)
- allegati FILE (su DB come link?)
- fix nuova scheda x file upload/download
- show/hide pannello storico schede
................................................................................................................
@@ -82,4 +78,9 @@ Gestione FILES
- selezione multipla delle schede ( es. cancellazione dal dossier ) --> inserire selezione con checkbox? NO x ora, provare versione con nuove gestioni...
- export excel "in bianco" (da compilare) da verificare - se funzionano reports è già così, sennò... è un qualcosa da portare avanti con futura release...
- Potrebbero servire schede speciali in cui i valori di Minimo e Massimo sono variabili (tolleranze variabili a FDO) -> si è deciso con Carlo di costruire delle schede con 2 valori TESTUALI + un file allegato, x cui misura 1 = valori massimi da ORDINE, misura 2 valori massimi rilevati, misura 3 OK / KO (con deroga...), misura 4 = allegato file
- in generale F1 = help del significato delle varie Icone. --> TOOLTIP
................................................................................................................
CMS_SC/WebUserControls/mod_elencoSchedeDossier.ascx
+4 -4
View File
@@ -10,7 +10,7 @@
&nbsp;<asp:LinkButton ID="lbCancel" runat="server" CausesValidation="False" CommandName="Cancel" ToolTip="Cancel" CssClass="fa fa-undo fa-2x" />
</EditItemTemplate>
<ItemTemplate>
<asp:LinkButton ID="lbEdit" runat="server" CausesValidation="False" CommandName="Edit" ToolTip="Edit" CssClass="fa fa-edit fa-2x" />
<asp:LinkButton ID="lbEdit" runat="server" CausesValidation="False" CommandName="Edit" ToolTip="Edit" CssClass="fa fa-edit fa-2x" Visible='<%# isWriteEnabled %>' />
</ItemTemplate>
</asp:TemplateField>
<asp:BoundField DataField="CodScheda" HeaderText="CodScheda" ReadOnly="True" SortExpression="CodScheda" />
@@ -18,16 +18,16 @@
<asp:BoundField DataField="NumScheda" HeaderText="#" ReadOnly="True" SortExpression="NumScheda" />
<asp:BoundField DataField="opz" HeaderText="opz" SortExpression="opz" ControlStyle-Width="2em" />
<asp:BoundField DataField="Descrizione" HeaderText="Descrizione" SortExpression="Descrizione" ControlStyle-Width="50em" />
<asp:BoundField DataField="FasiEnab" HeaderText="FasiEnab" SortExpression="FasiEnab" ControlStyle-Width="12em" />
<asp:BoundField DataField="FasiEnab" HeaderText="FasiEnab" SortExpression="FasiEnab" ControlStyle-Width="12em" />
<asp:TemplateField ShowHeader="False" ItemStyle-Wrap="false">
<HeaderTemplate>
</HeaderTemplate>
<ItemTemplate>
<asp:LinkButton ID="lbDelete" runat="server" CausesValidation="False" CommandName="Delete" ToolTip="Delete" OnClientClick='<%# SteamWare.jsUtils.getCBE("confermaDel") %>' CssClass="fa fa-trash fa-2x" />
<asp:LinkButton ID="lbDelete" runat="server" CausesValidation="False" CommandName="Delete" ToolTip="Delete" OnClientClick='<%# SteamWare.jsUtils.getCBE("confermaDel") %>' CssClass="fa fa-trash fa-2x" Visible='<%# isWriteEnabled %>' />
</ItemTemplate>
</asp:TemplateField>
</Columns>
<PagerStyle CssClass="active GridPager" />
<PagerStyle CssClass="active GridPager" />
<PagerSettings Mode="NumericFirstLast" />
<SelectedRowStyle CssClass="info" />
</asp:GridView>
CMS_SC/WebUserControls/mod_elencoSchedeDossier.ascx.cs
+1 -1
View File
@@ -9,7 +9,7 @@ using SteamWare;
namespace CMS_SC.WebUserControls
{
public partial class mod_elencoSchedeDossier : System.Web.UI.UserControl
public partial class mod_elencoSchedeDossier : SteamWare.UserControl
{
/// <summary>
/// selezione valore in DettScheda
CMS_SC/bin/CMS-SC-Data.dll
BIN
View File
Binary file not shown.
CMS_SC/bin/CMS_SC.dll
BIN
View File
Binary file not shown.
CMS_SC/bin/SteamWare.dll
BIN
View File
Binary file not shown.
VersGen/CMS_SC.cs
+2 -2
View File
@@ -5,7 +5,7 @@
using System.Reflection;
[assembly: AssemblyVersion("1.8.074.349")]
[assembly: AssemblyFileVersion("1.8.074.349")]
[assembly: AssemblyVersion("1.8.075.350")]
[assembly: AssemblyFileVersion("1.8.075.350")]
[assembly: AssemblyCopyright("Steamware © 2009-2015")]
[assembly: AssemblyCompany("Steamware")]
VersGen/CMS_SC.tt
+2 -2
View File
@@ -6,8 +6,8 @@
using System.Reflection;
[assembly: AssemblyVersion("1.8.074.<#= this.RevisionNumber #>")]
[assembly: AssemblyFileVersion("1.8.074.<#= this.RevisionNumber #>")]
[assembly: AssemblyVersion("1.8.075.<#= this.RevisionNumber #>")]
[assembly: AssemblyFileVersion("1.8.075.<#= this.RevisionNumber #>")]
[assembly: AssemblyCopyright("Steamware © 2009-<#= DateTime.Now.Year #>")]
[assembly: AssemblyCompany("Steamware")]
<#+
VersGen/bin/Release/VersGen.dll
BIN
View File
Binary file not shown.