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

Update ER

Browse Source
This commit is contained in:
Samuele E. Locatelli
2018-07-28 10:45:10 +02:00
parent 8be8523ee1
commit 2b739a5411
5 changed files with 136 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Data/utils.cs
+22 -5
View File
@@ -29,7 +29,7 @@ namespace Data
destinatario = memLayer.ML.CRS("_debugEmail");
#endif
// se richeisto webPush...
if(tipoNotifica==2 || tipoNotifica==3)
if (tipoNotifica == 2 || tipoNotifica == 3)
{
sendPushNotification();
answ = true;
@@ -41,13 +41,30 @@ namespace Data
}
return answ;
}
/// <summary>
/// Gestione invio push notifications
/// </summary>
/// <summary>
/// Gestione invio push notifications
/// </summary>
private static void sendPushNotification()
{
// da fare... sottoscrizione canale?!?
}
/// <summary>
/// Ripulisce le note per display
/// </summary>
/// <param name="original"></param>
/// <returns></returns>
public static string parseNote(object original)
{
string answ = original.ToString();
// fix a capo..
answ = answ.Replace("\n", @"<br/>");
// fix linee...
answ = answ.Replace("---", @"<hr/>");
// fix bold...
answ = answ.Replace("[[", @"<b>").Replace("]]", @"</b>");
return answ;
}
}
}
PUB/CronJobs.aspx.cs
+10 -3
View File
@@ -1,4 +1,5 @@
using System;
using SteamWare;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
@@ -18,10 +19,16 @@ namespace PUB
/// </summary>
private void checkRichieste()
{
// verifico richeiste NON in carico...
// verifico richieste NON in carico...
// invio email a B2BC / Amministratore condominio
// invio email a B2BC / Amministratore condominio... base URL poi pagine come PBO / PAM / PAZ
}
protected string urlDettaglio(string roleUrl)
{
string baseUrl = memLayer.ML.CRS("baseUrl");
return string.Format("{0}/{1}/DettaglioIntervento?idxRichiesta=", baseUrl, roleUrl);
}
}
}
PUB/WebUserContols/mod_ER_detail.ascx
+74 -48
View File
@@ -1,5 +1,9 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_ER_detail.ascx.cs" Inherits="PUB.WebUserContols.mod_ER_detail" %>
<asp:ObjectDataSource ID="odsPrior" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="GetData" TypeName="Data.DS_appTableAdapters.AnagPriorTableAdapter"></asp:ObjectDataSource>
<asp:ObjectDataSource ID="odsArea" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="GetData" TypeName="Data.DS_appTableAdapters.AnagAreeTableAdapter"></asp:ObjectDataSource>
<asp:ObjectDataSource ID="odsForn" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="GetData" TypeName="Data.DS_appTableAdapters.AnagFornitoriTableAdapter"></asp:ObjectDataSource>
<asp:FormView ID="frmView" runat="server" DataKeyNames="idxRichiesta" DataSourceID="ods" Width="100%">
<EditItemTemplate>
idxRichiesta:
@@ -211,6 +215,9 @@
<div class="col">
<h5>Dettaglio richiesta #<%# Eval("IdxRichiesta") %></h5>
</div>
<div class="col text-center">
<i class='<%# Eval("cssStato") %>'></i> <%# Eval("stato") %>
</div>
<div class="col text-right">
condominio <b><%# Eval("nom_cond") %></b> (<%# Eval("cod_cond") %>)
</div>
@@ -218,19 +225,78 @@
</div>
<div class="card-body mw-100">
<div class="row">
<div class="col-6">
<div class="col-12">
<div class="row mb-2">
<div class="col">
<asp:LinkButton runat="server" ID="lbtPreventivo" CssClass="btn btn-sm btn-info btn-block"><i class="far fa-envelope"></i> Richiesta Preventivo</asp:LinkButton>
</div>
<div class="col">
<asp:LinkButton runat="server" ID="lbtScadenza" CssClass="btn btn-sm btn-warning btn-block"><i class="fas fa-bell"></i> Imposta Scadenza</asp:LinkButton>
</div>
<div class="col">
<asp:LinkButton runat="server" ID="lbtCambiaForn" CssClass="btn btn-sm btn-info btn-block"><i class="far fa-envelope"></i> Sollecito Fornitore</asp:LinkButton>
</div>
<div class="col">
<asp:LinkButton runat="server" ID="lbtUrgenza" CssClass="btn btn-sm btn-danger btn-block"><i class="fas fa-sync"></i> Cambia Urgenza</asp:LinkButton>
</div>
<div class="col">
<asp:LinkButton runat="server" ID="lbtFornitore" CssClass="btn btn-sm btn-danger btn-block"><i class="fas fa-sync"></i> Cambia Fornitore</asp:LinkButton>
</div>
<div class="col">
<asp:LinkButton runat="server" ID="lbtMessaggio" CssClass="btn btn-sm btn-success btn-block"><i class="fas fa-pencil-alt"></i> Modifica Messaggio</asp:LinkButton>
</div>
<div class="col">
<asp:LinkButton runat="server" ID="lbtNota" CssClass="btn btn-sm btn-success btn-block"><i class="fas fa-plus"></i> Aggiungi Nota</asp:LinkButton>
</div>
</div>
</div>
<div class="col-6">
<div class="row text-right">
<div class="row small">
<div class="col-4">
Richiesta:
</div>
<div class="col-8 text-right">
inserita da <b><%# Eval("collaboratore") %></b> (<%# Eval("codCollabRich") %>)
<br />
<%# Eval("dataIns","{0:dddd dd.MM.yyyy HH:mm}") %>
</div>
</div>
<div class="row small bg-light">
<div class="col-3">
Urgenza
<br />
<asp:DropDownList runat="server" ID="ddlUrgenza" DataSourceID="odsPrior" DataTextField="descrPriorita" DataValueField="idxPriorita" SelectedValue='<%# Eval("idxPriorita") %>' Enabled="false" CssClass="form-control form-control-sm"></asp:DropDownList>
</div>
<div class="col-3">
Area
<br />
<asp:DropDownList runat="server" ID="ddlArea" DataSourceID="odsArea" DataTextField="Area" DataValueField="idxArea" SelectedValue='<%# Eval("idxArea") %>' Enabled="false" CssClass="form-control form-control-sm"></asp:DropDownList>
</div>
<div class="col-6 text-right">
Fornitore
<br />
<asp:DropDownList runat="server" ID="ddlFornitore" DataSourceID="odsForn" DataTextField="nome" DataValueField="idxFornitore" SelectedValue='<%# Eval("idxFornitore") %>' Enabled="false" CssClass="form-control form-control-sm"></asp:DropDownList>
</div>
</div>
</div>
<div class="col-6">
<div class="row">
<div class="col-12 small">
<i class="far fa-bell"></i>| Messaggio
<asp:Label ID="lblMessaggio" runat="server" CssClass="form-control" Width="100%" Text='<%# Eval("messaggio") %>' />
<i class="far fa-bell"></i>Messaggio
<asp:Label ID="lblmessaggio" runat="server" CssClass="form-control" Text='<%# Eval("messaggio") %>' />
</div>
<div class="col-12 small my-3 text-right">
<i class="fas fa-phone"></i>
Contattare sig. <b><%# Eval("genContatto") %></b> al <%# Eval("telContatto") %>
</div>
<div class="col-12 text-warning small">
<i class="far fa-comment"></i>| Note
<asp:Label ID="lblNote" runat="server" CssClass="form-control" Text='<%# Eval("note") %>' />
<i class="far fa-comment"></i>Note
<div class="form-control mw-100"><%# Data.utils.parseNote(Eval("note")) %></div>
</div>
<div class="col-12 small my-3 text-right">
inserire storico azioni... svuotando note
</div>
</div>
</div>
<%--
@@ -285,25 +351,6 @@
</div>
</div>
idxStato:
<asp:Label ID="idxStatoLabel" runat="server" Text='<%# Bind("idxStato") %>' />
<br />
idxCond:
<asp:Label ID="idxCondLabel" runat="server" Text='<%# Bind("idxCond") %>' />
<br />
idxPriorita:
<asp:Label ID="idxPrioritaLabel" runat="server" Text='<%# Bind("idxPriorita") %>' />
<br />
idxArea:
<asp:Label ID="idxAreaLabel" runat="server" Text='<%# Bind("idxArea") %>' />
<br />
idxFornitore:
<asp:Label ID="idxFornitoreLabel" runat="server" Text='<%# Bind("idxFornitore") %>' />
<br />
cod_fornitore:
<asp:Label ID="cod_fornitoreLabel" runat="server" Text='<%# Bind("cod_fornitore") %>' />
<br />
dataRich:
<asp:Label ID="dataRichLabel" runat="server" Text='<%# Bind("dataRich") %>' />
@@ -311,15 +358,6 @@
dataScad:
<asp:Label ID="dataScadLabel" runat="server" Text='<%# Bind("dataScad") %>' />
<br />
codCollabRich:
<asp:Label ID="codCollabRichLabel" runat="server" Text='<%# Bind("codCollabRich") %>' />
<br />
genContatto:
<asp:Label ID="genContattoLabel" runat="server" Text='<%# Bind("genContatto") %>' />
<br />
telContatto:
<asp:Label ID="telContattoLabel" runat="server" Text='<%# Bind("telContatto") %>' />
<br />
iscritta:
<asp:Label ID="iscrittaLabel" runat="server" Text='<%# Bind("iscritta") %>' />
<br />
@@ -358,19 +396,7 @@
<br />
controllo_temporale:
<asp:CheckBox ID="controllo_temporaleCheckBox" runat="server" Checked='<%# Bind("controllo_temporale") %>' Enabled="false" />
<br />
stato:
<asp:Label ID="statoLabel" runat="server" Text='<%# Bind("stato") %>' />
<br />
cssStato:
<asp:Label ID="cssStatoLabel" runat="server" Text='<%# Bind("cssStato") %>' />
<br />
collaboratore:
<asp:Label ID="collaboratoreLabel" runat="server" Text='<%# Bind("collaboratore") %>' />
<br />
dataIns:
<asp:Label ID="dataInsLabel" runat="server" Text='<%# Bind("dataIns") %>' />
<br />
</ItemTemplate>
</asp:FormView>
<asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getByKey" TypeName="Data.DS_appTableAdapters.ElencolRichTableAdapter">
PUB/WebUserContols/mod_ER_detail.ascx.cs
+3
View File
@@ -4,6 +4,7 @@ using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
using Data;
namespace PUB.WebUserContols
{
@@ -13,5 +14,7 @@ namespace PUB.WebUserContols
{
}
}
}
PUB/WebUserContols/mod_ER_detail.ascx.designer.cs
Generated
+27
View File
@@ -12,6 +12,33 @@ namespace PUB.WebUserContols {
public partial class mod_ER_detail {
/// <summary>
/// Controllo odsPrior.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.WebControls.ObjectDataSource odsPrior;
/// <summary>
/// Controllo odsArea.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.WebControls.ObjectDataSource odsArea;
/// <summary>
/// Controllo odsForn.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.WebControls.ObjectDataSource odsForn;
/// <summary>
/// Controllo frmView.
/// </summary>