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

elenco progetti/commesse quasi completo (con creazione nuove commesse/fasi da testare)

Browse Source
This commit is contained in:
Samuele Locatelli
2013-05-14 11:20:39 +02:00
parent fc21b4eac2
commit 0eb38990ee
16 changed files with 38 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ETS_Data/obj/Debug/ETS_Data.csproj.FileListAbsolute.txt
+1
View File
@@ -17,3 +17,4 @@ C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\ETS\ETS_Data
C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\ETS\ETS_Data\bin\Debug\NLog.xml
C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\ETS\ETS_Data\obj\Debug\ETS_Data.dll
C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\ETS\ETS_Data\obj\Debug\ETS_Data.pdb
C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\ETS\ETS_Data\obj\Debug\ETS_Data.csprojResolveAssemblyReference.cache
ETS_Data/obj/Debug/ETS_Data.csprojResolveAssemblyReference.cache
BIN
View File
Binary file not shown.
ETS_Data/obj/Debug/ETS_Data.dll
BIN
View File
Binary file not shown.
PROJ-ETS/PROJ-ETS/Content/MasterPage.css
+1 -1
View File
@@ -29,7 +29,7 @@ ol, ul {
}
/* tables still need 'cellspacing="0"' in the markup */
table {
border-collapse: separate;
border-collapse: collapse;
border-spacing: 0;
}
caption, th, td {
PROJ-ETS/PROJ-ETS/Images/newBlu_l.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.7 KiB

PROJ-ETS/PROJ-ETS/Images/newBlu_m.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB

PROJ-ETS/PROJ-ETS/Images/newBlu_s.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

PROJ-ETS/PROJ-ETS/PROJ-ETS.csproj
+3
View File
@@ -199,6 +199,9 @@
<Content Include="Images\cancel_l.png" />
<Content Include="Images\cancel_m.png" />
<Content Include="Images\cancel_s.png" />
<Content Include="Images\newBlu_l.png" />
<Content Include="Images\newBlu_m.png" />
<Content Include="Images\newBlu_s.png" />
<Content Include="Images\edit_l.png" />
<Content Include="Images\edit_m.png" />
<Content Include="Images\edit_s.png" />
PROJ-ETS/PROJ-ETS/Progetti.aspx
+1
View File
@@ -27,6 +27,7 @@
<uc1:mod_progetti ID="mod_progetti1" runat="server" />
</div>
<div class="divSx">
<div style="height:46px"></div>
<uc2:mod_commesse ID="mod_commesse1" runat="server" Visible="false" />
</div>
<div class="clearDiv"></div>
PROJ-ETS/PROJ-ETS/WebUserControls/mod_commesse.ascx
+29 -30
View File
@@ -22,7 +22,7 @@
<Columns>
<asp:TemplateField ShowHeader="False" ItemStyle-HorizontalAlign="Center" ItemStyle-Wrap="false">
<ItemTemplate>
<asp:ImageButton ID="imgSelect" runat="server" CausesValidation="False" CommandName="Select" ToolTip="Seleziona" ImageUrl="../images/view_m.png" />
<%--<asp:ImageButton ID="imgSelect" runat="server" CausesValidation="False" CommandName="Select" ToolTip="Seleziona" ImageUrl="../images/view_m.png" />--%>
<asp:ImageButton ID="imgEdit" runat="server" CausesValidation="False" CommandName="Edit" ToolTip="Modifica" ImageUrl="../images/edit_m.png" Visible='<%# isWritable() %>' />
</ItemTemplate>
<EditItemTemplate>
@@ -34,23 +34,22 @@
<asp:ImageButton ID="imgCancel" runat="server" CausesValidation="False" CommandName="Cancel" ToolTip="Cancel" ImageUrl="../images/cancel_m.png" />
</FooterTemplate>
<HeaderTemplate>
<asp:ImageButton ID="imgBtnReset" runat="server" ToolTip="Reset" CausesValidation="False" OnClick="btnReset_Click" ImageUrl="../images/reload_l.png" Visible="true" />
<%--<asp:ImageButton ID="imgBtnReset" runat="server" ToolTip="Reset" CausesValidation="False" OnClick="btnReset_Click" ImageUrl="../images/reload_l.png" Visible="true" />--%>
</HeaderTemplate>
<ItemStyle HorizontalAlign="Center"></ItemStyle>
</asp:TemplateField>
<asp:TemplateField ItemStyle-HorizontalAlign="Left" HeaderText="Commessa / Fasi" SortExpression="nomeFase">
<asp:TemplateField ItemStyle-HorizontalAlign="Left" HeaderText="Commessa / Fasi" >
<ItemTemplate>
<div class="divSx">
<asp:Image runat="server" ID="imgSpaz" Width='<%# widthByCod(Eval("codFase")) %>' ImageUrl="~/images/EmptyImg.png" />
</div>
<div class="divSx">
<div style="text-align: left; padding: 2px 3px 2px 3px;" class='<%# classByCod(Eval("codFase")) %>'>
<div style="text-align: left; padding: 2px 3px 2px 3px; width: 300px;" class='<%# classByCod(Eval("codFase")) %>'>
<asp:Label ID="nomeFaseLabel" runat="server" Text='<%# Eval("nomeFase") %>' Font-Strikeout='<%# invBool(Eval("Attivo")) %>'
Font-Bold="true" />
</div>
<%--<asp:Label ID="codFaseLabel" runat="server" Text='<%# Eval("codFase") %>' />--%>
<div class="fontPiccolo textGrigio" style="text-align: left; padding: 2px 3px 2px 3px;">
<asp:Label ID="descrizioneFaseLabel" runat="server" Text='<%# Eval("descrizioneFase") %>' />
<div class="textGrigio" style="text-align: left; padding: 2px 3px 2px 3px; width: 300px;">
<asp:Label ID="descrizioneFaseLabel" runat="server" Text='<%# Eval("descrizioneFase") %>' Font-Size="7pt" />
</div>
</div>
</ItemTemplate>
@@ -76,50 +75,50 @@
</FooterTemplate>
<ItemStyle HorizontalAlign="Center"></ItemStyle>
</asp:TemplateField>
<asp:TemplateField HeaderText="Time" SortExpression="enableTime">
<asp:TemplateField HeaderText="T" SortExpression="enableTime">
<ItemTemplate>
<%--<ajaxtoolkit:togglebuttonextender id="tglTime" runat="server" targetcontrolid="chkenableTime" imagewidth="22" imageheight="22"
checkedimagealternatetext="Time track ATTIVO" uncheckedimagealternatetext="Time track NON attivo" uncheckedimageurl="~/images/timeDis_m.png"
checkedimagealternatetext="Time track Attivo (s/n)" uncheckedimagealternatetext="Time track NON Attivo (s/n)" uncheckedimageurl="~/images/timeDis_m.png"
checkedimageurl="~/images/time_m.png" />--%>
<asp:CheckBox ID="chkenableTime" runat="server" Checked='<%# Eval("enableTime") %>' Enabled="false" />
<asp:CheckBox ID="chkenableTime" runat="server" Checked='<%# Eval("enableTime") %>' Enabled="false" ToolTip="Time Track Attivo (s/n)" />
</ItemTemplate>
<EditItemTemplate>
<%--<ajaxtoolkit:togglebuttonextender id="tglTime" runat="server" targetcontrolid="chkenableTime" imagewidth="22" imageheight="22"
checkedimagealternatetext="Time track ATTIVO" uncheckedimagealternatetext="Time track NON attivo" uncheckedimageurl="~/images/timeDis_m.png"
checkedimagealternatetext="Time track Attivo (s/n)" uncheckedimagealternatetext="Time track NON Attivo (s/n)" uncheckedimageurl="~/images/timeDis_m.png"
checkedimageurl="~/images/time_m.png" />--%>
<asp:CheckBox ID="chkenableTime" runat="server" Checked='<%# Bind("enableTime") %>' Enabled="true" />
<asp:CheckBox ID="chkenableTime" runat="server" Checked='<%# Bind("enableTime") %>' Enabled="true" ToolTip="Time Track Attivo (s/n)" />
</EditItemTemplate>
<FooterTemplate>
<%--<ajaxtoolkit:togglebuttonextender id="tglTime" runat="server" targetcontrolid="chkenableTime" imagewidth="22" imageheight="22"
checkedimagealternatetext="Time track ATTIVO" uncheckedimagealternatetext="Time track NON attivo" uncheckedimageurl="~/images/timeDis_m.png"
checkedimagealternatetext="Time track Attivo (s/n)" uncheckedimagealternatetext="Time track NON Attivo (s/n)" uncheckedimageurl="~/images/timeDis_m.png"
checkedimageurl="~/images/time_m.png" />--%>
<asp:CheckBox ID="chkenableTime" runat="server" Checked='<%# Bind("enableTime") %>' Enabled="true" />
<asp:CheckBox ID="chkenableTime" runat="server" Checked='<%# Bind("enableTime") %>' Enabled="true" ToolTip="Time Track Attivo (s/n)" />
</FooterTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="Money" SortExpression="enableMoney">
<asp:TemplateField HeaderText="M" SortExpression="enableMoney">
<ItemTemplate>
<%--<ajaxtoolkit:togglebuttonextender id="tglMoney" runat="server" targetcontrolid="chkenableMoney" imagewidth="22" imageheight="22"
checkedimagealternatetext="Money track ATTIVO" uncheckedimagealternatetext="Money track NON attivo" uncheckedimageurl="~/images/moneyDis_m.png"
checkedimagealternatetext="Money track Attivo (s/n)" uncheckedimagealternatetext="Money track NON Attivo (s/n)" uncheckedimageurl="~/images/moneyDis_m.png"
checkedimageurl="~/images/money_m.png" />--%>
<asp:CheckBox ID="chkenableMoney" runat="server" Checked='<%# Eval("enableMoney") %>' Enabled="false" />
<asp:CheckBox ID="chkenableMoney" runat="server" Checked='<%# Eval("enableMoney") %>' Enabled="false" ToolTip="Money Track Attivo (s/n)" />
</ItemTemplate>
<EditItemTemplate>
<%--<ajaxtoolkit:togglebuttonextender id="tglMoney" runat="server" targetcontrolid="chkenableMoney" imagewidth="22" imageheight="22"
checkedimagealternatetext="Money track ATTIVO" uncheckedimagealternatetext="Money track NON attivo" uncheckedimageurl="~/images/moneyDis_m.png"
checkedimagealternatetext="Money track Attivo (s/n)" uncheckedimagealternatetext="Money track NON Attivo (s/n)" uncheckedimageurl="~/images/moneyDis_m.png"
checkedimageurl="~/images/money_m.png" />--%>
<asp:CheckBox ID="chkenableMoney" runat="server" Checked='<%# Bind("enableMoney") %>' Enabled="true" />
<asp:CheckBox ID="chkenableMoney" runat="server" Checked='<%# Bind("enableMoney") %>' Enabled="true" ToolTip="Money Track Attivo (s/n)" />
</EditItemTemplate>
<FooterTemplate>
<%--<ajaxtoolkit:togglebuttonextender id="tglMoney" runat="server" targetcontrolid="chkenableMoney" imagewidth="22" imageheight="22"
checkedimagealternatetext="Money track ATTIVO" uncheckedimagealternatetext="Money track NON attivo" uncheckedimageurl="~/images/moneyDis_m.png"
checkedimagealternatetext="Money track Attivo (s/n)" uncheckedimagealternatetext="Money track NON Attivo (s/n)" uncheckedimageurl="~/images/moneyDis_m.png"
checkedimageurl="~/images/money_m.png" />--%>
<asp:CheckBox ID="chkenableMoney" runat="server" Checked='<%# Bind("enableMoney") %>' Enabled="true" />
<asp:CheckBox ID="chkenableMoney" runat="server" Checked='<%# Bind("enableMoney") %>' Enabled="true" ToolTip="Money Track Attivo (s/n)" />
</FooterTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="Ore/Bdgt" SortExpression="budgetTime" ItemStyle-HorizontalAlign="Center" HeaderStyle-HorizontalAlign="Center">
<asp:TemplateField HeaderText="Ore" SortExpression="budgetTime" ItemStyle-HorizontalAlign="Center" HeaderStyle-HorizontalAlign="Center">
<ItemTemplate>
<asp:Panel runat="server" ID="pnlTime" CssClass='<%# colorByVal(Eval("totOre"),Eval("budgetTime"))%>' Style="font-size: 8pt; padding: .3em;"
Width="8em" Visible='<%# Bind("enableTime") %>'>
Width="6em" Visible='<%# Bind("enableTime") %>'>
<asp:Label ID="lblRealTime" runat="server" Text='<%# Eval("totOre","{0:#,###.##}") %>' ToolTip="Ore Erogate" />
/
<asp:Label ID="lblbudgetTime" runat="server" Text='<%# Eval("budgetTime","{0:#,###.##}") %>' ToolTip="OreBudget" />
@@ -133,12 +132,12 @@
<asp:TextBox ID="txtbudgetTime" runat="server" Text='<%# Bind("budgetTime") %>' Width="3em" />
</FooterTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="Attivo" SortExpression="Attivo" ItemStyle-HorizontalAlign="Center">
<asp:TemplateField HeaderText="A" SortExpression="Attivo (s/n)" ItemStyle-HorizontalAlign="Center">
<ItemTemplate>
<asp:CheckBox ID="chkAttivo" runat="server" Checked='<%# Eval("Attivo") %>' Enabled="false" />
<asp:CheckBox ID="chkAttivo" runat="server" Checked='<%# Eval("Attivo") %>' Enabled="false" ToolTip="Attivo (s/n)" />
</ItemTemplate>
<EditItemTemplate>
<asp:CheckBox ID="chkAttivo" runat="server" Checked='<%# Bind("Attivo") %>' Enabled="true" />
<asp:CheckBox ID="chkAttivo" runat="server" Checked='<%# Bind("Attivo") %>' Enabled="true" ToolTip="Attivo (s/n)" />
</EditItemTemplate>
<FooterTemplate>
</FooterTemplate>
@@ -146,7 +145,7 @@
<asp:TemplateField ShowHeader="False" ItemStyle-HorizontalAlign="Right">
<ItemTemplate>
<div class="divDx">
<asp:ImageButton ID="imgAddNew" runat="server" CausesValidation="False" CommandName="Select" ImageUrl="../images/new_m.png"
<asp:ImageButton ID="imgAddNew" runat="server" CausesValidation="False" CommandName="Select" ImageUrl="../images/newBlu_m.png"
CommandArgument='<%# Eval("idxFase") %>' OnClick="btnNew_Click" ToolTip="Aggiungi Fase a commessa" Visible='<%# isAncestor(Eval("idxFaseAncest")) %>' />
&nbsp;
<asp:ImageButton ID="imgDelete" runat="server" CausesValidation="False" CommandArgument='<%# Eval("idxFase") %>' CommandName="Delete"
@@ -168,7 +167,7 @@
ToolTip="Cancel" />
</FooterTemplate>
<HeaderTemplate>
<asp:Button ID="btnNew" runat="server" OnClick="btnNew_Click" Text="Commessa" CssClass="btnNew" ToolTip="Aggiungi una nuova commessa al progetto" Visible='<%# isWritable() %>' />
<asp:Button ID="btnNew" runat="server" OnClick="btnNew_Click" Text="C" CssClass="btnNew" ToolTip="Aggiungi una nuova commessa al progetto" Visible='<%# isWritable() %>' />
</HeaderTemplate>
<ItemStyle HorizontalAlign="Center" />
</asp:TemplateField>
@@ -196,7 +195,7 @@
<asp:Parameter Name="enableMoney" Type="Boolean" />
<asp:Parameter Name="budgetTime" Type="Decimal" />
<asp:Parameter Name="budgetMoney" Type="Decimal" DefaultValue="0" />
<asp:Parameter Name="Attivo" Type="Boolean" DefaultValue="true" />
<asp:Parameter Name="Attivo (s/n)" Type="Boolean" DefaultValue="true" />
</InsertParameters>
<SelectParameters>
<asp:SessionParameter SessionField="idxProgetto_sel" Name="idxProgetto" Type="Int32" />
@@ -206,7 +205,7 @@
<asp:Parameter Name="descrizioneFase" Type="String" />
<asp:Parameter Name="enableTime" Type="Boolean" />
<asp:Parameter Name="enableMoney" Type="Boolean" />
<asp:Parameter Name="Attivo" Type="Int32" />
<asp:Parameter Name="Attivo (s/n)" Type="Int32" />
<asp:Parameter Name="budgetTime" Type="Decimal" />
<asp:Parameter Name="budgetMoney" Type="Decimal" DefaultValue="0" />
<asp:Parameter Name="Original_idxFase" Type="Int32" />
PROJ-ETS/PROJ-ETS/WebUserControls/mod_progetti.ascx
+3 -3
View File
@@ -80,7 +80,7 @@
</div>
</div>
</div>
<div class="clearDiv labelInput">
<div class="clearDiv labelInput" style="width:500px; white-space:normal;">
<asp:Label ID="lbldescrProj" runat="server" Text='<%# Eval("descrProj") %>' Font-Size="7pt" Font-Strikeout='<%# invBool(Eval("Attivo")) %>' />
</div>
</ItemTemplate>
@@ -98,7 +98,7 @@
</div>
</div>
</div>
<div class="clearDiv labelInput">
<div class="clearDiv labelInput" style="width:500px;">
<div class="divSx">
descrizione:<br />
<asp:TextBox ID="txtdescrProj" runat="server" Text='<%# Bind("descrProj") %>' Width="45em" TextMode="MultiLine" Height="4em" />
@@ -124,7 +124,7 @@
</div>
</div>
</div>
<div class="clearDiv labelInput">
<div class="clearDiv labelInput" style="width:500px;">
descrizione:<br />
<asp:TextBox ID="txtdescrProj" runat="server" Text='<%# Bind("descrProj") %>' Width="45em" TextMode="MultiLine" Height="4em" />
PROJ-ETS/PROJ-ETS/bin/ETS_Data.dll
BIN
View File
Binary file not shown.
PROJ-ETS/PROJ-ETS/bin/PROJ-ETS.dll
BIN
View File
Binary file not shown.
PROJ-ETS/PROJ-ETS/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
BIN
View File
Binary file not shown.
PROJ-ETS/PROJ-ETS/obj/Debug/PROJ-ETS.csprojResolveAssemblyReference.cache
BIN
View File
Binary file not shown.
PROJ-ETS/PROJ-ETS/obj/Debug/PROJ-ETS.dll
BIN
View File
Binary file not shown.