4 feb 20250 Isabelle-Luc

This commit is contained in:
Luc Vandenbroucke 2020-02-04 12:50:54 +01:00
parent 5b36940479
commit a6ec378ed0
6 changed files with 41 additions and 65 deletions

View file

@ -30,11 +30,15 @@
</telerik:GridBoundColumn>
<telerik:GridBoundColumn DataField="JustificationIncrease" HeaderText="Justification" SortExpression="JustificationIncrease" UniqueName="JustificationIncrease">
</telerik:GridBoundColumn>
<telerik:GridBoundColumn DataField="DateStart" HeaderText="Date when it starts applying" SortExpression="DateStart" UniqueName="DateStart" DataType="System.DateTime" DataFormatString="{0:yyyy-MM-dd}">
</telerik:GridBoundColumn>
<telerik:GridBoundColumn DataField="DateEnd" HeaderText="Date when it stops applying" SortExpression="DateEnd" UniqueName="DateEnd" DataType="System.DateTime" DataFormatString="{0:yyyy-MM-dd}">
</telerik:GridBoundColumn>
<%--<telerik:GridBoundColumn DataField="PersID" HeaderText="PersID" UniqueName="PersID"/>
<telerik:GridBoundColumn DataField="PersID_Resp" HeaderText="PersID_Resp" UniqueName="PersID_Resp"/>
--%>
<telerik:GridBoundColumn DataField="FNameAgent" HeaderText="Agent SC" UniqueName="FNameAgent" SortExpression="FNameAgent" ReadOnly="True">
</telerik:GridBoundColumn>
<telerik:GridBoundColumn DataField="LNameAgent" HeaderText="" UniqueName="LNameAgent" SortExpression="LNameAgent" ReadOnly="True">
@ -49,7 +53,7 @@
<asp:Label ID="Label3" runat="server" CssClass="rdfLabel rdfBlock" Text="Select the Person: "></asp:Label>
</td>
<td>
<asp:RequiredFieldValidator runat="server" ControlToValidate="RadComboBoxSelectPerson" ErrorMessage="!You need to select a name for the person!" ForeColor="Red" SetFocusOnError="true" />
<asp:RequiredFieldValidator runat="server" ControlToValidate="RadComboBoxSelectPerson" ErrorMessage="!You need to select a name for the person!" ForeColor="Red" SetFocusOnError="true" />
<telerik:RadComboBox ID="RadComboBoxSelectPerson" runat="server" AppendDataBoundItems="true" DataSourceID="SqlDSSelectPerson" DataTextField="displayName" DataValueField="PersID" Width="95%" SelectedValue ='<%# Bind("PersID") %>' >
<Items>
<telerik:RadComboBoxItem Text="-" Value="0" />
@ -108,7 +112,6 @@
<asp:Label ID="Label7" runat="server" CssClass="rdfLabel rdfBlock" Text="Register by (Agent SC of HPH): "></asp:Label>
</td>
<td>
<asp:RequiredFieldValidator runat="server" ControlToValidate="RadComboBoxSelectAgentSC" ErrorMessage="!You need to select a name for the agent SC!" ForeColor="Red" SetFocusOnError="true" />
<telerik:RadComboBox ID="RadComboBoxSelectAgentSC" runat="server" DataSourceID="SqlDSSelectAgentSC" DataTextField="displayName" DataValueField="PersID_Resp" Width="95%" SelectedValue='<%# Bind("PersID_Resp") %>'>
<Items>
<telerik:RadComboBoxItem Text="-" Value="0" />
@ -117,9 +120,6 @@
</td>
</tr>
</table>
<div class="rdfCommandButtons">
<hr class="rdfHr" />
@ -128,7 +128,6 @@
</div>
</FormTemplate>
</EditFormSettings>
</MasterTableView>
</telerik:RadGrid>
@ -155,18 +154,18 @@
<UpdateParameters>
<asp:Parameter Name="ID_ChangeLimit" Type="Int32" />
<asp:Parameter Name="PersID" Type="Int32" />
<asp:Parameter Name="PersID_Resp" Type="Int32" />
<asp:Parameter Name="JustificationIncrease" Type="String" />
<asp:Parameter Name="IncreaseQuarterLimit" Type="double" />
<asp:Parameter Name="IncreaseMonthlyLimit" Type="double" />
<asp:Parameter DbType="Date" Name="DateStart" />
<asp:Parameter Name="DateEnd" DbType="Date" />
<asp:Parameter Name="IncreaseQuarterLimit" Type="Double" />
<asp:Parameter Name="IncreaseMonthlyLimit" Type="double" />
<asp:Parameter Name="DateStart" DbType="Date" />
<asp:Parameter DbType="Date" Name="DateEnd" />
<asp:Parameter Name="PersID_Resp" Type="Int32" />
</UpdateParameters>
</asp:SqlDataSource>
<asp:SqlDataSource ID="SqlDSSelectPerson" runat="server" ConnectionString="<%$ ConnectionStrings:HPH_REMS_newConnectionString %>" SelectCommand="PersonList" SelectCommandType="StoredProcedure"></asp:SqlDataSource>
<asp:SqlDataSource ID="SqlDSSelectAgentSC" runat="server" ConnectionString="<%$ ConnectionStrings:HPH_REMS_newConnectionString %>" SelectCommand="SELECT [PersID_Resp], displayName=[LastName]+' '+[FirstName] FROM [V_SelectAgent SC]"></asp:SqlDataSource>
<asp:SqlDataSource ID="SqlDSSelectAgentSC" runat="server" ConnectionString="<%$ ConnectionStrings:HPH_REMS_newConnectionString %>" SelectCommand="SELECT [PersID_Resp]=persid, displayName=[LastName]+' '+[FirstName] FROM person; --[V_SelectAgent SC]"></asp:SqlDataSource>

View file

@ -116,9 +116,8 @@
<UpdateParameters>
<asp:Parameter Name="ID_DoseDocD" Type="Int32" />
<asp:Parameter Name="PersID" Type="Int32" />
<asp:Parameter Name="PersID_AgentSC" Type="Int32" />
<asp:Parameter DbType="Date" Name="Date_Dose" />
<asp:Parameter Name="Dose_52W_microSv" DbType="Double"/>
<asp:Parameter Name="Dose_52W_microSv" DbType="Double" />
<asp:Parameter Name="PersID_AgentSC" Type="Int32" />
</UpdateParameters>

View file

@ -1,14 +1,5 @@
<%@ Master Language="C#" %>
<script runat="server">
protected void Page_Load(object sender, EventArgs e)
{
}
</script>
<html xmlns="http://www.w3.org/1999/xhtml">
<head runat="server">
<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
@ -43,13 +34,10 @@
<h2 style="margin-top: 0; margin-bottom: 5px; float: left; width: 80%; background-color: inherit;">
<span>
<asp:Literal ID="Literal2" runat="server">REMS 2018</asp:Literal></span>
</h2>
<div style="width: 20%; float: right; background-color: inherit;">
</div>
</div>
</div>
@ -58,7 +46,6 @@
<telerik:RadMenu ID="RadMenu1" runat="server" EnableRoundedCorners="True" EnableShadows="True" Style="top: 0px; left: 0px">
<Items>
<telerik:RadMenuItem Text="Worker" NavigateUrl="Worker.aspx" >
<Items>
<telerik:RadMenuItem runat="server" NavigateUrl="~/Worker.aspx" Text="Worker Overview">
</telerik:RadMenuItem>

View file

@ -84,8 +84,8 @@
</tr>
<tr>
<td style="color: darkblue; font-weight: bold">
<asp:Label ID="Label21" runat="server" CssClass="rdfLabel rdfBlock" Text="1. Check in the folder 'Limit' bellow that the Margin is high enough for the 'Min. margin for the task'. If that is not the case you can add some Limits. Go to Alarm/Add limit."></asp:Label>
<td style="color: darkblue; font-weight: bold; font-family:Arial;"; >
<asp:Label ID="Label21" runat="server" Text="1. Check in the folder 'Limit' below that the Margin is high enough for the 'Min. margin for the task'. If that is not the case you can add some Limits. Go to Alarm/Add limit."></asp:Label>
</td>
</tr>
@ -279,25 +279,25 @@
</tr>
</table>
</fieldset>
<tr style="font-weight: bold">
<asp:Label ID="Label29" runat="server" CssClass="rdfLabel rdfBlock" Text="Dose via Doc D:"></asp:Label>
</tr>
<table style="width: 100%;">
<tr>
<td>
<asp:Label ID="Label30" runat="server" CssClass="rdfLabel rdfBlock" Text="Dose (µSv):"></asp:Label>
</td>
<td>
<asp:Label ID="Label31" runat="server" CssClass="rdfFieldValue" Text='<%# Eval("LastDate") %>' />
</td>
<td>
<asp:Label ID="Label32" runat="server" CssClass="rdfLabel rdfBlock" Text="op:"></asp:Label>
</td>
<td>
<asp:Label ID="Label33" runat="server" CssClass="rdfFieldValue" Text='<%# Eval("LastDate") %>' />
</td>
</tr>
</table>
<tr style="font-weight: bold">
<asp:Label ID="Label29" runat="server" CssClass="rdfLabel rdfBlock" Text="Dose via Doc D:"></asp:Label>
</tr>
<table style="width: 100%;">
<tr>
<td>
<asp:Label ID="Label30" runat="server" CssClass="rdfLabel rdfBlock" Text="Dose (µSv):"></asp:Label>
</td>
<td>
<asp:Label ID="Label31" runat="server" CssClass="rdfFieldValue" Text='<%# Eval("Dose_52W_microSv") %>' />
</td>
<td>
<asp:Label ID="Label32" runat="server" CssClass="rdfLabel rdfBlock" Text="op:"></asp:Label>
</td>
<td>
<asp:Label ID="Label33" runat="server" CssClass="rdfFieldValue" Text='<%# Eval("LastDate", "{0:yyyy-MM-dd}") %>' />
</td>
</tr>
</table>
</ItemTemplate>
</telerik:RadDataForm>
@ -365,7 +365,7 @@
<asp:SqlDataSource ID="getPersonLimit" runat="server"
ConnectionString="<%$ ConnectionStrings:HPH_REMS_newConnectionString %>"
SelectCommand="SELECT PersID, YearToDateLimit, ConCode, MonthlyLimit, QuarterLimit, AccessAllow, SUMHp10Dose_Y_2deci, SUMHp07Dose_Y_2deci, SUMHpNDose_Y_2deci, SUMHp10Dose_Q_2deci, SUMHp07Dose_Q_2deci, SUMHpNDose_Q_2deci, SUMHp10Dose_M_2deci, SUMHp07Dose_M_2deci, SUMHpNDose_M_2deci, MarginHP10_M_2deci, MarginHP10_Y_2deci, MarginHP10_Q_2deci, MaxAddLimY, MaxAddLimQ, MaxAddLimM,LastDate FROM V_SumDosePersonLimit_2deci where PersID=@PersID">
SelectCommand="SELECT PersID, YearToDateLimit, ConCode, MonthlyLimit, QuarterLimit, AccessAllow, SUMHp10Dose_Y_2deci, SUMHp07Dose_Y_2deci, SUMHpNDose_Y_2deci, SUMHp10Dose_Q_2deci, SUMHp07Dose_Q_2deci, SUMHpNDose_Q_2deci, SUMHp10Dose_M_2deci, SUMHp07Dose_M_2deci, SUMHpNDose_M_2deci, MarginHP10_M_2deci, MarginHP10_Y_2deci, MarginHP10_Q_2deci, MaxAddLimY, MaxAddLimQ, MaxAddLimM,LastDate,Dose_52W_microSv FROM V_SumDosePersonLimit_2deci where PersID=@PersID">
<SelectParameters>
<asp:ControlParameter ControlID="cmbPerson" Name="PersID" PropertyName="SelectedValue" />
</SelectParameters>

View file

@ -60,15 +60,18 @@
<Reference Include="System.Xml.Linq" />
<Reference Include="Telerik.Web.Design, Version=2020.1.114.45, Culture=neutral, PublicKeyToken=121fae78165ba3d4, processorArchitecture=MSIL">
<HintPath>..\packages\Telerik.UI.for.AspNet.Ajax.Net45.2020.1.114\lib\net45\Telerik.Web.Design.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Telerik.Web.Device.Detection, Version=2020.1.114.45, Culture=neutral, PublicKeyToken=121fae78165ba3d4, processorArchitecture=MSIL">
<HintPath>..\packages\Telerik.UI.for.AspNet.Ajax.Net45.2020.1.114\lib\net45\Telerik.Web.Device.Detection.dll</HintPath>
</Reference>
<Reference Include="Telerik.Web.UI, Version=2020.1.114.45, Culture=neutral, PublicKeyToken=121fae78165ba3d4, processorArchitecture=MSIL">
<HintPath>..\packages\Telerik.UI.for.AspNet.Ajax.Net45.2020.1.114\lib\net45\Telerik.Web.UI.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Telerik.Web.UI.Skins, Version=2020.1.114.45, Culture=neutral, PublicKeyToken=121fae78165ba3d4, processorArchitecture=MSIL">
<HintPath>..\packages\Telerik.UI.for.AspNet.Ajax.Net45.2020.1.114\lib\net45\Telerik.Web.UI.Skins.dll</HintPath>
<Private>True</Private>
</Reference>
</ItemGroup>
<ItemGroup>
@ -257,7 +260,7 @@
<SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
</WebProjectProperties>
</FlavorProperties>
<UserProperties UseAjaxifiedTemplates="False" UseJQuerySupport="False" />
<UserProperties UseJQuerySupport="False" UseAjaxifiedTemplates="False" />
</VisualStudio>
</ProjectExtensions>
</Project>

View file

@ -4,23 +4,11 @@
<add name="HPH_REMS_newConnectionString" connectionString="Data Source=sqlsrv3;Initial Catalog=HPH_REMS_new;Integrated Security=True" providerName="System.Data.SqlClient" />
</connectionStrings>
<appSettings>
<add key="Telerik.Web.UI.RenderMode" value="lightweight" />
<add key="Telerik.Web.UI.RenderMode" value="Classic" />
<add key="ValidationSettings:UnobtrusiveValidationMode" value="None" />
<add key="Telerik.Skin" value="Outlook" />
<add key="Telerik.Skin" value="WebBlue" />
<add key="Telerik.ScriptManager.TelerikCdn" value="Enabled" />
<add key="Telerik.StyleSheetManager.TelerikCdn" value="Enabled" />
</appSettings>
<!--
For a description of web.config changes see http://go.microsoft.com/fwlink/?LinkId=235367.