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

avanzamento update dati commessa

Browse Source
This commit is contained in:
Samuele Locatelli
2013-05-24 09:57:33 +02:00
parent 52fd6a2e37
commit aefba711dc
10 changed files with 63 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ETS_Data/obj/Debug/ETS_Data.dll
BIN
View File
Binary file not shown.
PROJ-ETS/PROJ-ETS/Content/Style.css
+17 -1
View File
@@ -296,7 +296,7 @@ div > ul > li > a.selected.menuNav {
.padStd {
padding: 4px;
}
.bordoGrigio {
.placardGrigio {
padding: 4px;
-moz-border-radius: 4px;
-webkit-border-radius: 4px;
@@ -304,6 +304,14 @@ div > ul > li > a.selected.menuNav {
border: 2px solid #696969;
background-color: #ECECEC;
}
.placardNero {
padding: 4px;
-moz-border-radius: 4px;
-webkit-border-radius: 4px;
border-radius: 4px;
border: 2px solid Black;
background-color: white;
}
/* end zona placard*/
/* zona colorazione filtri */
.filtro_1 {
@@ -312,6 +320,14 @@ div > ul > li > a.selected.menuNav {
.filtro_2 {
background-color: #aaaaff;
}
.filtro_2:hover {
color: #8888ff;
background-color: #dedeff;
}
.filtro_2 a:link {
color: white;
background-color: transparent;
}
.filtro_3 {
background-color: #ccccff;
}
PROJ-ETS/PROJ-ETS/Content/Style.less
+18 -2
View File
@@ -360,11 +360,19 @@ div > ul > li > a.selected.menuNav {
.padStd {
padding: @padStd;
}
.bordoGrigio {
.placardGrigio {
.padStd;
.roundedCorner;
border: 2px solid #696969;
background-color:#ECECEC;
background-color: #ECECEC;
}
.placardNero {
.padStd;
.roundedCorner;
border: 2px solid Black;
background-color: white;
}
/* end zona placard*/
@@ -376,6 +384,14 @@ div > ul > li > a.selected.menuNav {
.filtro_2 {
background-color: #aaaaff;
&:hover{
color: #8888ff;
background-color: #dedeff;
}
a:link{
color: white;
background-color: transparent;
}
}
.filtro_3 {
PROJ-ETS/PROJ-ETS/Content/Style.min.css
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
PROJ-ETS/PROJ-ETS/WebUserControls/mod_datiComm.ascx
+21 -6
View File
@@ -4,7 +4,7 @@
<ItemTemplate>
<div class="filtro_1 fontPiccolo ui-corner-all" style="white-space: nowrap; height: 20px; padding: 4px; min-width: 402px;">
<div class="divSx filtro_2 ui-corner-all" style="padding: 3px; margin-right: 4px; height: 14px; min-width: 400px;">
<asp:Label ID="NomeCommLabel" runat="server" Text='<%# Eval("NomeComm") %>' Font-Bold="true" />
<asp:HyperLink runat="server" ID="lnkProgetti" NavigateUrl="~/Progetti" Text='<%# Eval("NomeComm") %>' Font-Bold="true" />
</div>
</div>
<div>
@@ -12,11 +12,29 @@
<div>
<div class="divSx padStd">
<asp:Label ID="lblAnno" runat="server" Text="Anno" AssociatedControlID="AnnoCommessa" />
<asp:Label ID="AnnoCommessa" runat="server" Text='<%# Eval("AnnoCommessa") %>' CssClass="divSx bordoGrigio" />
<asp:Label ID="AnnoCommessa" runat="server" Text='<%# Eval("AnnoCommessa") %>' CssClass="divSx placardGrigio" />
</div>
<div class="divDx padStd">
<asp:Label ID="lblNumeroCommessa" runat="server" Text="Numero" AssociatedControlID="NumeroCommessa" />
<asp:Label ID="NumeroCommessa" runat="server" Text='<%# Eval("NumeroCommessa","{0:0000}") %>' CssClass="divDx bordoGrigio" />
<asp:Label ID="NumeroCommessa" runat="server" Text='<%# Eval("NumeroCommessa","{0:0000}") %>' CssClass="divDx placardGrigio" />
</div>
</div>
<div class="clearDiv padStd">
<asp:Label ID="lblPubblico" runat="server" Text="Tipo commessa" AssociatedControlID="rblPubblica" />
<div class="placardNero" style="border-width: 1px;">
<asp:RadioButtonList ID="rblPubblica" runat="server" SelectedValue='<%# Eval("Pubblico") %>' RepeatDirection="Horizontal" Width="100%">
<asp:ListItem Text="pubblica" Value="True"></asp:ListItem>
<asp:ListItem Text="privata" Value="False"></asp:ListItem>
</asp:RadioButtonList>
</div>
</div>
<div class="clearDiv padStd">
<asp:Label ID="lblSQ" runat="server" Text="Tipo SQ" AssociatedControlID="rblSQC" />
<div class="placardNero" style="border-width: 1px;">
<asp:RadioButtonList ID="rblSQC" runat="server" SelectedValue='<%# Eval("SQC") %>' RepeatDirection="Horizontal" Width="100%">
<asp:ListItem Text="maggiore" Value="True"></asp:ListItem>
<asp:ListItem Text="minore" Value="False"></asp:ListItem>
</asp:RadioButtonList>
</div>
</div>
</div>
@@ -42,9 +60,6 @@
CapoCommessa:
<asp:Label ID="CapoCommessaLabel" runat="server" Text='<%# Eval("CapoCommessa") %>' />
<br />
SQC:
<asp:CheckBox ID="SQCCheckBox" runat="server" Checked='<%# Eval("SQC") %>' Enabled="false" />
<br />
Pubblico:
<asp:CheckBox ID="PubblicoCheckBox" runat="server" Checked='<%# Eval("Pubblico") %>' Enabled="false" />
<br />
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/logs/2013-05-24.log
+6
View File
@@ -6,3 +6,9 @@
2013-05-24 09:14:20.8933 [INFO] L'utente Locatelli Samuele (STEAMWAREWIN\samuele) ha effettuato il login correttamente
2013-05-24 09:16:10.9352 [INFO] L'utente Locatelli Samuele (STEAMWAREWIN\samuele) ha effettuato il login correttamente
2013-05-24 09:18:16.3997 [INFO] L'utente Locatelli Samuele (STEAMWAREWIN\samuele) ha effettuato il login correttamente
2013-05-24 09:23:54.1404 [INFO] User login: Locatelli Samuele (STEAMWAREWIN\samuele)
2013-05-24 09:23:54.3975 [INFO] L'utente Locatelli Samuele (STEAMWAREWIN\samuele) ha effettuato il login correttamente
2013-05-24 09:25:17.6198 [INFO] L'utente Locatelli Samuele (STEAMWAREWIN\samuele) ha effettuato il login correttamente
2013-05-24 09:26:37.0187 [INFO] L'utente Locatelli Samuele (STEAMWAREWIN\samuele) ha effettuato il login correttamente
2013-05-24 09:37:29.8457 [INFO] User login: Locatelli Samuele (STEAMWAREWIN\samuele)
2013-05-24 09:38:05.8600 [INFO] L'utente Locatelli Samuele (STEAMWAREWIN\samuele) ha effettuato il login correttamente
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.