Egalware/MoonPro.net
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Inserito segnaposto disegno (proof of concept) + img sorting elenco controlli

Browse Source
This commit is contained in:
Samuele E. Locatelli
2018-03-14 08:30:06 +01:00
parent 8349e0ab03
commit c508bf198d
8 changed files with 25 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.vs/config/applicationhost.config
+6 -6
View File
@@ -170,7 +170,7 @@
</site>
<site name="MP-Admin" id="3">
<application path="/" applicationPool="Clr4IntegratedAppPool">
<virtualDirectory path="/" physicalPath="C:\Users\samuele\Documents\VisualStudioProjects\MoonPro_dotnet\MP-Admin" />
<virtualDirectory path="/" physicalPath="C:\Users\samuele.steamw\Documents\Visual Studio 2017\Projects\MoonPro_dotnet\MP-Admin" />
</application>
<bindings>
<binding protocol="http" bindingInformation="*:56734:localhost" />
@@ -178,7 +178,7 @@
</site>
<site name="MoonProTablet" id="4">
<application path="/" applicationPool="Clr4IntegratedAppPool">
<virtualDirectory path="/" physicalPath="C:\Users\samuele\Documents\VisualStudioProjects\MoonPro_dotnet\MP-Tablet" />
<virtualDirectory path="/" physicalPath="C:\Users\samuele.steamw\Documents\Visual Studio 2017\Projects\MoonPro_dotnet\MP-Tablet" />
</application>
<bindings>
<binding protocol="http" bindingInformation="*:56739:localhost" />
@@ -186,7 +186,7 @@
</site>
<site name="MP-Site" id="5">
<application path="/" applicationPool="Clr4IntegratedAppPool">
<virtualDirectory path="/" physicalPath="C:\Users\samuele\Documents\VisualStudioProjects\MoonPro_dotnet\MP-Site" />
<virtualDirectory path="/" physicalPath="C:\Users\samuele.steamw\Documents\Visual Studio 2017\Projects\MoonPro_dotnet\MP-Site" />
</application>
<bindings>
<binding protocol="http" bindingInformation="*:54806:localhost" />
@@ -202,7 +202,7 @@
</site>
<site name="MP" id="7">
<application path="/" applicationPool="Clr4IntegratedAppPool">
<virtualDirectory path="/" physicalPath="C:\Users\samuele\Documents\VisualStudioProjects\MoonPro_dotnet\MP" />
<virtualDirectory path="/" physicalPath="C:\Users\samuele.steamw\Documents\Visual Studio 2017\Projects\MoonPro_dotnet\MP" />
</application>
<bindings>
<binding protocol="http" bindingInformation="*:2809:localhost" />
@@ -226,7 +226,7 @@
</site>
<site name="MP-IO(1)" id="10">
<application path="/" applicationPool="Clr4IntegratedAppPool">
<virtualDirectory path="/" physicalPath="C:\Users\samuele\Documents\VisualStudioProjects\MoonPro_dotnet\MP-IO" />
<virtualDirectory path="/" physicalPath="C:\Users\samuele.steamw\Documents\Visual Studio 2017\Projects\MoonPro_dotnet\MP-IO" />
</application>
<bindings>
<binding protocol="http" bindingInformation="*:20967:localhost" />
@@ -234,7 +234,7 @@
</site>
<site name="MP-MON(1)" id="11">
<application path="/" applicationPool="Clr4IntegratedAppPool">
<virtualDirectory path="/" physicalPath="C:\Users\samuele\Documents\VisualStudioProjects\MoonPro_dotnet\MP-MON" />
<virtualDirectory path="/" physicalPath="C:\Users\samuele.steamw\Documents\Visual Studio 2017\Projects\MoonPro_dotnet\MP-MON" />
</application>
<bindings>
<binding protocol="http" bindingInformation="*:14216:localhost" />
Jenkinsfile
Vendored
+1 -1
View File
@@ -17,7 +17,7 @@ pipeline {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=707']) {
withEnv(['NEXT_BUILD_NUMBER=708']) {
// env.versionNumber = VersionNumber(versionNumberString : '5.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '5.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'MAPO'
MP-Tablet/Files/Disegni/ND.pdf
BIN
View File
Binary file not shown.
MP-Tablet/Files/Disegni/PlaceHolder.file
+1
View File
@@ -0,0 +1 @@

MP-Tablet/MP-Tablet.csproj
+10 -1
View File
@@ -370,6 +370,13 @@
<Content Include="Content\bootstrap-reboot.css.map" />
<Content Include="Content\bootstrap-grid.min.css.map" />
<Content Include="Content\bootstrap-grid.css.map" />
<Content Include="Resources\Disegni\ND.docx" />
<Content Include="Files\Disegni\ND.pdf">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Files\Disegni\PlaceHolder.file">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<None Include="NLog.xsd">
<SubType>Designer</SubType>
</None>
@@ -948,7 +955,9 @@
</Compile>
</ItemGroup>
<ItemGroup>
<Content Include="logs\PlaceHolder.file" />
<Content Include="logs\PlaceHolder.file">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
</ItemGroup>
<ItemGroup>
<Content Include="packages.config" />
MP-Tablet/Resources/Disegni/ND.docx
BIN
View File
Binary file not shown.
MP-Tablet/WebUserControls/mod_dettMacchina.ascx
+6 -1
View File
@@ -5,7 +5,7 @@
<div class="row">
<asp:Repeater ID="repLI" runat="server" DataSourceID="ods">
<ItemTemplate>
<div class="col-12">
<div class="col-9 col-sm-10">
<div class="card text-white mapBlock rCAll">
<div class='card <%# Eval("Semaforo") %> p-0 m-0 rCAll'>
<div class="row justify-content-center m-2 bg-black">
@@ -44,6 +44,11 @@
</div>
</div>
</div>
<div class="col-3 col-sm-2">
<asp:HyperLink runat="server" ID="hlDisegno" NavigateUrl="~/Files/Disegni/ND.pdf" CssClass="btn btn-secondary btn-sm btn-block" Target="_blank">
<i class="fa fa-file-pdf-o fa-2x"></i><br /><div class="small">DIS.</div>
</asp:HyperLink>
</div>
</ItemTemplate>
</asp:Repeater>
</div>
MP-Tablet/WebUserControls/mod_elencoControlli.ascx
+1 -1
View File
@@ -6,7 +6,7 @@
<uc1:mod_selPeriodo runat="server" ID="mod_selPeriodo" />
<asp:GridView ID="grView" runat="server" CssClass="table table-striped table-dark table-sm" DataSourceID="ods" AutoGenerateColumns="False" DataKeyNames="IdxControllo" AllowSorting="true" AllowPaging="true" PageSize="5">
<Columns>
<asp:TemplateField HeaderText="Elenco Controlli" SortExpression="DataOra" HeaderStyle-CssClass="btn btn-sm btn-block btn-info text-info" HeaderStyle-ForeColor="White">
<asp:TemplateField HeaderText="Elenco Controlli <i class='fa fa-sort'></i>" SortExpression="DataOra" HeaderStyle-CssClass="btn btn-sm btn-block btn-secondary text-info" HeaderStyle-ForeColor="White">
<ItemTemplate>
<div class="row">
<div class="col-5 small">