luc/eDosWeb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

na validatie Isabelle

Browse source
This commit is contained in:
Luc Vandenbroucke 2020-04-08 12:05:08 +02:00
parent 3e92388c10
commit 75ce7fac70
24 changed files with 190 additions and 83 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
eDos/AddLimitAgent.aspx
View file

@ -6,12 +6,8 @@
<telerik:RadGrid ID="RadGrid1" runat="server" AllowAutomaticInserts="True" AllowAutomaticUpdates="True" AllowSorting="True" CellSpacing="-1" GridLines="Both" AllowAutomaticDeletes="True" AllowCustomPaging="True" AllowFilteringByColumn="True" AllowPaging="True" AutoGenerateColumns="False" DataSourceID="sqlDSV_AddLimitAgent">
<GroupingSettings CollapseAllTooltip="Collapse all groups" CaseSensitive="false"/>
<ExportSettings>
<Pdf PageWidth="">
</Pdf>
<Excel FileExtension="xlsx" Format="Xlsx" />
</ExportSettings>
<ClientSettings AllowColumnsReorder="True">
</ClientSettings>
<MasterTableView DataKeyNames="ID_ChangeLimit" CommandItemDisplay="Top" DataSourceID="sqlDSV_AddLimitAgent" EditMode="EditForms" >
<CommandItemSettings ShowExportToExcelButton="True" AddNewRecordText="Add limits" />
<Columns>

2
eDos/AddLimitHPH.aspx
View file

@ -10,8 +10,6 @@
</Pdf>
<Excel FileExtension="xlsx" Format="Xlsx" />
</ExportSettings>
<ClientSettings AllowColumnsReorder="True">
</ClientSettings>
<MasterTableView DataKeyNames="ID_ChangeLimit" CommandItemDisplay="Top" DataSourceID="sqlDSV_AddLimitHPH" EditMode="EditForms" >
<CommandItemSettings ShowExportToExcelButton="True" AddNewRecordText="Add limits" />
<Columns>

4
eDos/ClearVisitAlarm.aspx
View file

@ -3,6 +3,8 @@
<asp:Content ID="Content1" ContentPlaceHolderID="head" runat="server">
</asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="ContentPlaceHolder1" runat="server">
<telerik:RadGrid ID="RadGrid1" runat="server" AllowAutomaticUpdates="True" AllowSorting="True" CellSpacing="-1" GridLines="Both" AllowCustomPaging="True" AllowFilteringByColumn="True" AllowPaging="True" AutoGenerateColumns="False" DataSourceID="SqlDSListVistClear">
<GroupingSettings CollapseAllTooltip="Collapse all groups" CaseSensitive="false" />
<ExportSettings>
@ -53,7 +55,6 @@
<table>
<tr>
<td>
<asp:Label ID="Label111"></asp:Label>
</td>
<td>
<asp:Label ID="Label13" runat="server" AssociatedControlID="isAlarmClearedCheckBox" Text="I have seen the alarm and I decide to clear it:"></asp:Label>
@ -88,4 +89,5 @@
</UpdateParameters>
</asp:SqlDataSource>
</asp:Content>

3
eDos/ClearVisitAlarm.aspx.cs
View file

@ -4,6 +4,7 @@ using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
using Telerik.Web.UI;
namespace Rems2018
{
@ -17,5 +18,7 @@ namespace Rems2018
titelControl.Text = "Clear Visit Alarm";
}
}
}

4
eDos/CommentToInstallation.aspx
View file

@ -3,15 +3,13 @@
<asp:Content ID="Content1" ContentPlaceHolderID="head" runat="server">
</asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="ContentPlaceHolder1" runat="server">
<telerik:RadGrid ID="RadGrid1" runat="server" AllowAutomaticInserts="True" AllowAutomaticUpdates="True" AllowSorting="True" CellSpacing="-1" GridLines="Both" AllowAutomaticDeletes="True" AllowCustomPaging="True" AllowFilteringByColumn="True" AllowPaging="True" AutoGenerateColumns="False" DataSourceID="sqlDSCommentToInstallation">
<telerik:RadGrid ID="RadGrid1" runat="server" AllowAutomaticInserts="True" AllowAutomaticUpdates="True" AllowSorting="True" CellSpacing="-1" GridLines="Both" AllowAutomaticDeletes="True" AllowFilteringByColumn="True" AutoGenerateColumns="False" DataSourceID="sqlDSCommentToInstallation">
<GroupingSettings CollapseAllTooltip="Collapse all groups"></GroupingSettings>
<ExportSettings>
<Pdf PageWidth="">
</Pdf>
<Excel FileExtension="xlsx" Format="Xlsx" />
</ExportSettings>
<ClientSettings AllowColumnsReorder="True">
</ClientSettings>
<MasterTableView DataKeyNames="ID_CommentToInstallation" CommandItemDisplay="Top" AllowAutomaticDeletes="False" DataSourceID="sqlDSCommentToInstallation" >
<CommandItemSettings ShowExportToExcelButton="True" AddNewRecordText="Nieuw comment"/>
<Columns>

8
eDos/CommentToPerson.aspx
View file

@ -3,15 +3,13 @@
<asp:Content ID="Content1" ContentPlaceHolderID="head" runat="server">
</asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="ContentPlaceHolder1" runat="server">
<telerik:RadGrid ID="RadGrid1" runat="server" AllowAutomaticInserts="True" AllowAutomaticUpdates="True" AllowSorting="True" CellSpacing="-1" GridLines="Both" AllowAutomaticDeletes="True" AllowCustomPaging="True" AllowFilteringByColumn="True" AllowPaging="True" AutoGenerateColumns="False" DataSourceID="sqlDSV_CommentToPerson">
<telerik:RadGrid ID="RadGrid1" runat="server" AllowAutomaticInserts="True" AllowAutomaticUpdates="True" AllowSorting="True" CellSpacing="-1" GridLines="Both" AllowAutomaticDeletes="True" AllowFilteringByColumn="True" AutoGenerateColumns="False" DataSourceID="sqlDSV_CommentToPerson">
<GroupingSettings CollapseAllTooltip="Collapse all groups" CaseSensitive="false"/>
<ExportSettings>
<Pdf PageWidth="">
</Pdf>
<Excel FileExtension="xlsx" Format="Xlsx" />
</ExportSettings>
<ClientSettings AllowColumnsReorder="True">
</ClientSettings>
<MasterTableView DataKeyNames="ID_CommentToPerson" CommandItemDisplay="Top" DataSourceID="sqlDSV_CommentToPerson" EditMode="EditForms" >
<CommandItemSettings ShowExportToExcelButton="True" AddNewRecordText="Nieuw comment" />
<Columns>
@ -86,7 +84,7 @@
<tr>
<td style="font-weight: bold">
<asp:Label ID="Label9" runat="server" CssClass="rdfLabel rdfBlock" Text="When should the comment be displaied ?:"></asp:Label>
<asp:Label ID="Label9" runat="server" CssClass="rdfLabel rdfBlock" Text="When should the comment be displayed ?:"></asp:Label>
</td>
<td>
<telerik:RadDatePicker ID="RadDateEnd" runat="server" DbSelectedDate='<%# Bind("CommentDateApply") %>' />
@ -96,7 +94,7 @@
<tr>
<td style="font-weight: bold">
<asp:Label ID="Label5" runat="server" CssClass="rdfLabel rdfBlock" Text="How many time should it be displaied ?:"></asp:Label>
<asp:Label ID="Label5" runat="server" CssClass="rdfLabel rdfBlock" Text="How many times should it be displayed ?:"></asp:Label>
</td>
<td>
<asp:TextBox ID="NumberOfTimeToDisplay" runat="server" CssClass="rdfFieldValue" Text='<%# Bind("NumberOfTimeToDisplay") %>' />

5
eDos/ManualReturn.aspx
View file

@ -3,7 +3,7 @@
<asp:Content ID="Content1" ContentPlaceHolderID="head" runat="server">
</asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="ContentPlaceHolder1" runat="server">
<telerik:RadGrid ID="RadGrid1" runat="server" AllowAutomaticUpdates="True" AllowSorting="True" CellSpacing="-1" GridLines="Both" AllowCustomPaging="True" AllowFilteringByColumn="True" AllowPaging="True" AutoGenerateColumns="False" DataSourceID="SqlDSManualReturn">
<telerik:RadGrid ID="RadGrid1" runat="server" AllowAutomaticUpdates="True" AllowSorting="True" CellSpacing="-1" GridLines="Both" AllowCustomPaging="True" AllowFilteringByColumn="True" AllowPaging="True" PageSize="100" AutoGenerateColumns="False" DataSourceID="SqlDSManualReturn">
<GroupingSettings CollapseAllTooltip="Collapse all groups" CaseSensitive="false" />
<SortingSettings SortedDescToolTip="ID_Visit" />
<ExportSettings>
@ -11,9 +11,6 @@
</Pdf>
<Excel FileExtension="xlsx" Format="Xlsx" />
</ExportSettings>
<ClientSettings AllowColumnsReorder="True">
<Scrolling AllowScroll="True" UseStaticHeaders="True" />
</ClientSettings>
<MasterTableView DataKeyNames="ID_Station,ID_Visit" CommandItemDisplay="Top" DataSourceID="SqlDSManualReturn" EditMode="EditForms">
<CommandItemSettings ShowExportToExcelButton="True" ShowAddNewRecordButton="False" />
<Columns>

18
eDos/Properties/PublishProfiles/eDosTest.pubxml Normal file
View file

@ -0,0 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
This file is used by the publish/package process of your Web project. You can customize the behavior of this process
by editing this MSBuild file. In order to learn more about this please visit https://go.microsoft.com/fwlink/?LinkID=208121.
-->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<WebPublishMethod>FileSystem</WebPublishMethod>
<PublishProvider>FileSystem</PublishProvider>
<LastUsedBuildConfiguration>Debug</LastUsedBuildConfiguration>
<LastUsedPlatform>Any CPU</LastUsedPlatform>
<SiteUrlToLaunchAfterPublish />
<LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
<ExcludeApp_Data>False</ExcludeApp_Data>
<publishUrl>\\scksrv61\eDosTest</publishUrl>
<DeleteExistingFiles>True</DeleteExistingFiles>
</PropertyGroup>
</Project>

5
eDos/Properties/licenses.licx
View file

@ -1,3 +1,8 @@
Telerik.Web.UI.RadMultiPage, Telerik.Web.UI, Version=2020.1.114.45, Culture=neutral, PublicKeyToken=121fae78165ba3d4
Telerik.Web.UI.RadTabStrip, Telerik.Web.UI, Version=2020.1.114.45, Culture=neutral, PublicKeyToken=121fae78165ba3d4
Telerik.Web.UI.RadDataForm, Telerik.Web.UI, Version=2020.1.114.45, Culture=neutral, PublicKeyToken=121fae78165ba3d4
Telerik.Web.UI.RadComboBox, Telerik.Web.UI, Version=2020.1.114.45, Culture=neutral, PublicKeyToken=121fae78165ba3d4
Telerik.Web.UI.RadSearchBox, Telerik.Web.UI, Version=2020.1.114.45, Culture=neutral, PublicKeyToken=121fae78165ba3d4
Telerik.Web.UI.RadGrid, Telerik.Web.UI, Version=2020.1.114.45, Culture=neutral, PublicKeyToken=121fae78165ba3d4
Telerik.Web.UI.RadDatePicker, Telerik.Web.UI, Version=2019.2.514.45, Culture=neutral, PublicKeyToken=121fae78165ba3d4
Telerik.Web.UI.RadMultiPage, Telerik.Web.UI, Version=2019.2.514.45, Culture=neutral, PublicKeyToken=121fae78165ba3d4

3
eDos/Site.master
View file

@ -33,7 +33,7 @@
<div id="header" class="header-top2">
<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>
<asp:Literal ID="Literal2" runat="server">eDos 2020</asp:Literal></span>
</h2>
<div style="width: 20%; float: right; background-color: inherit;">
</div>
@ -41,7 +41,6 @@
</div>
<div style="clear: both;">
<telerik:RadMenu ID="RadMenu1" runat="server" EnableRoundedCorners="True" EnableShadows="True" Style="top: 0px; left: 0px">
<Items>

17
eDos/TaskBG.aspx
View file

@ -3,7 +3,7 @@
<asp:Content ID="Content1" ContentPlaceHolderID="head" runat="server">
</asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="ContentPlaceHolder1" runat="server">
<telerik:RadGrid ID="RadGrid1" runat="server" AllowAutomaticInserts="True" AllowAutomaticUpdates="True" AllowSorting="True" CellSpacing="-1" GridLines="Both" AllowAutomaticDeletes="True" AllowFilteringByColumn="True" AllowPaging="True" AutoGenerateColumns="False" DataSourceID="sqlDSV_Task" PagerStyle-Mode="Slider">
<telerik:RadGrid ID="RadGrid1" runat="server" AllowAutomaticInserts="True" AllowAutomaticUpdates="True" AllowSorting="True" CellSpacing="-1" GridLines="Both" AllowAutomaticDeletes="True" AllowFilteringByColumn="True" AllowPaging="True" AutoGenerateColumns="False" DataSourceID="sqlDSV_Task" PagerStyle-Mode="Slider" OnItemCreated="RadGrid1_ItemCreated">
<GroupingSettings CollapseAllTooltip="Collapse all groups" CaseSensitive="false"></GroupingSettings>
<ExportSettings>
<Pdf PageWidth="">
@ -13,7 +13,7 @@
<ClientSettings AllowColumnsReorder="True">
<%-- <Scrolling AllowScroll="True" UseStaticHeaders="True" ScrollHeight="700px" />--%>
</ClientSettings>
<MasterTableView DataKeyNames="ID_Task" CommandItemDisplay="Top" AllowAutomaticDeletes="False" DataSourceID="sqlDSV_Task" EditMode="EditForms">
<MasterTableView DataKeyNames="ID_Task" CommandItemDisplay="Top" AllowAutomaticDeletes="False" DataSourceID="sqlDSV_Task" EditMode="EditForms">
<CommandItemSettings ShowExportToExcelButton="True" AddNewRecordText="Add new task" />
<Columns>
<telerik:GridButtonColumn CommandName="Edit" Text="Edit" ButtonCssClass="rgEdit" UniqueName="EditColumn" HeaderStyle-Width="30px">
@ -26,15 +26,14 @@
</telerik:GridBoundColumn>
<telerik:GridBoundColumn DataField="Inst_CODE" HeaderText="Code" UniqueName="Inst_CODE" DataType="System.Int32" SortExpression="Inst_CODE" HeaderStyle-Width="60px" FilterControlAltText="Filter Inst_CODE column">
</telerik:GridBoundColumn>
<telerik:GridBoundColumn DataField="TaskType_CODE" HeaderText="Task Type" SortExpression="TaskType_CODE" UniqueName="TaskType_CODE" DataType="System.Int32" FilterControlWidth="50px" HeaderStyle-Width="110px">
<telerik:GridBoundColumn DataField="TaskType_CODE" HeaderText="Task Nr" SortExpression="TaskType_CODE" UniqueName="TaskType_CODE" DataType="System.Int32" FilterControlWidth="50px" HeaderStyle-Width="110px" ReadOnly="true" >
</telerik:GridBoundColumn>
<telerik:GridBoundColumn DataField="Task_Name" HeaderText="Task" UniqueName="Task_Name" SortExpression="Task_Name" HeaderStyle-Width="200px">
</telerik:GridBoundColumn>
<telerik:GridBoundColumn DataField="TaskDescription" HeaderText="Description" UniqueName="TaskDescription" SortExpression="TaskDescription" HeaderStyle-Width="200px">
</telerik:GridBoundColumn>
<telerik:GridBoundColumn DataField="EPDRad" HeaderText="EPDRad" UniqueName="EPDRad" SortExpression="EPDRad" FilterControlWidth="50px" HeaderStyle-Width="80px" ReadOnly="true" />
<telerik:GridBoundColumn DataField="AlarmEPDName" HeaderText="AlarmEPD" UniqueName="AlarmEPDName" SortExpression="AlarmEPDName" HeaderStyle-Width="200px">
</telerik:GridBoundColumn>
<telerik:GridBoundColumn DataField="AlarmEPDName" HeaderText="AlarmEPD" UniqueName="AlarmEPDName" SortExpression="AlarmEPDName" HeaderStyle-Width="200px"/>
<telerik:GridBoundColumn DataField="TaskDateStart" HeaderText="Task Start" SortExpression="TaskDateStart" UniqueName="TaskDateStart" FilterControlAltText="Filter TaskDateStart column" DataType="System.DateTime" DataFormatString="{0:yyyy-MM-dd}"></telerik:GridBoundColumn>
<telerik:GridBoundColumn DataField="TaskDateEnd" DataType="System.DateTime" HeaderText="Task End" SortExpression="TaskDateEnd" UniqueName="TaskDateEnd" DataFormatString="{0:yyyy-MM-dd}">
</telerik:GridBoundColumn>
@ -43,7 +42,6 @@
<telerik:GridBoundColumn DataField="FNGain_AnGainValue" DataType="System.Double" HeaderText="FN AN Gain" UniqueName="FNGain_AnGainValue" SortExpression="FNGain_AnGainValue" HeaderStyle-Width="50px">
</telerik:GridBoundColumn>
<telerik:GridBoundColumn DataField="InstallationActivity" HeaderText="Activity" SortExpression="InstallationActivity" UniqueName="InstallationActivity" />
</Columns>
<EditFormSettings EditFormType="Template">
<FormTemplate>
@ -61,7 +59,7 @@
<asp:Label ID="Label11" runat="server" CssClass="rdfLabel rdfBlock" Text="Task nr. :"></asp:Label>
</td>
<td>
<asp:TextBox ID="Label12" runat="server" CssClass="rdfFieldValue" Text='<%# Bind("TaskType_CODE") %>' />
<asp:TextBox ID="lblTaskType_CODE" runat="server" CssClass="rdfFieldValue" Text='<%# Bind("TaskType_CODE") %>' />
</td>
</tr>
<tr>
@ -112,7 +110,7 @@
<asp:Label ID="Label22" runat="server" CssClass="rdfLabel rdfBlock" Text="Alarm EPD Level: "></asp:Label>
</td>
<td>
<telerik:RadComboBox ID="RadComboBoxSelectAlarmLevel" runat="server" DataTextField="AlarmEPDName" DataValueField="ID_AlarmEPD" Width="95%" SelectedValue='<%# Bind("ID_AlarmEPD") %>' OnLoad="RadComboBoxSelectAlarmLevel_Load" />
<telerik:RadComboBox ID="RadComboBoxSelectAlarmLevel" runat="server" DataTextField="AlarmEPDName" DataValueField="ID_AlarmEPD" Width="95%" SelectedValue='<%# Bind("ID_AlarmEPD") %>' DataSourceID="SqlDSSelectAlarmLevel"/>
</td>
</tr>
@ -134,7 +132,7 @@
ConnectionString="<%$ ConnectionStrings:eDosConnectionString %>"
SelectCommand="TaskBGSelect" SelectCommandType="StoredProcedure"
InsertCommand="TaskBGInsert" InsertCommandType="StoredProcedure"
UpdateCommand="TaskBGUpdate" UpdateCommandType="StoredProcedure">
UpdateCommand="TaskBGUpdate" UpdateCommandType="StoredProcedure" >
<InsertParameters>
<asp:Parameter Name="Inst_CODE" Type="Int32" />
<asp:Parameter Name="TaskType_CODE" Type="Int32" />
@ -156,7 +154,6 @@
<asp:Parameter Name="TaskDateStart" Type="DateTime" />
<asp:Parameter Name="TaskDateEnd" Type="DateTime" />
<asp:Parameter Name="TaskEnable" Type="Boolean" />
<asp:Parameter Direction="ReturnValue" Name="RETURN_VALUE" Type="Int32" />
</UpdateParameters>
</asp:SqlDataSource>

29
eDos/TaskBG.aspx.cs
View file

@ -53,6 +53,35 @@ namespace Rems2018
LoadAlarmComboBox("*", c2);
}
protected void sqlDSV_Task_Updating(object sender, SqlDataSourceCommandEventArgs e)
{
var x = e.Command.Parameters["@ID_AlarmEPD"].Value;
}
protected void RadComboBoxSelectAlarmLevel_SelectedIndexChanged(object sender, RadComboBoxSelectedIndexChangedEventArgs e)
{
}
protected void RadGrid1_ItemCreated(object sender, GridItemEventArgs e)
{
if (e.Item is GridEditableItem && e.Item.IsInEditMode)
{
if (e.Item is GridEditFormInsertItem || e.Item is GridDataInsertItem)
{
// insert item
}
else
{
var x = e.Item.FindControl("lblTaskType_CODE") as TextBox;
x.ReadOnly = true;
// edit item
}
}
}
//protected void RadGrid1_ItemDataBound(object sender, GridItemEventArgs e)
//{
// if (e.Item.IsInEditMode)

5
eDos/TaskNG.aspx
View file

@ -3,7 +3,7 @@
<asp:Content ID="Content1" ContentPlaceHolderID="head" runat="server">
</asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="ContentPlaceHolder1" runat="server">
<telerik:RadGrid ID="RadGrid1" runat="server" AllowAutomaticInserts="True" AllowAutomaticUpdates="True" AllowSorting="True" CellSpacing="-1" GridLines="Both" AllowAutomaticDeletes="True" AllowFilteringByColumn="True" AllowPaging="True" AutoGenerateColumns="False" DataSourceID="sqlDSV_Task" PagerStyle-Mode="Slider">
<telerik:RadGrid ID="RadGrid1" runat="server" AllowAutomaticInserts="True" AllowAutomaticUpdates="True" AllowSorting="True" CellSpacing="-1" GridLines="Both" AllowAutomaticDeletes="True" AllowFilteringByColumn="True" AllowPaging="True" AutoGenerateColumns="False" DataSourceID="sqlDSV_Task" PagerStyle-Mode="Slider" OnItemCreated="RadGrid1_ItemCreated">
<GroupingSettings CollapseAllTooltip="Collapse all groups" CaseSensitive="false"></GroupingSettings>
<ExportSettings>
<Pdf PageWidth="">
@ -61,7 +61,7 @@
<asp:Label ID="Label11" runat="server" CssClass="rdfLabel rdfBlock" Text="Task nr. :"></asp:Label>
</td>
<td>
<asp:TextBox ID="Label12" runat="server" CssClass="rdfFieldValue" Text='<%# Bind("TaskType_CODE") %>' />
<asp:TextBox ID="lblTaskType_CODE" runat="server" CssClass="rdfFieldValue" Text='<%# Bind("TaskType_CODE") %>' />
</td>
</tr>
<tr>
@ -164,7 +164,6 @@
<asp:Parameter Name="TaskDateEnd" Type="DateTime" />
<asp:Parameter Name="TaskEnable" Type="Boolean" />
<asp:Parameter Name="ID_FNGainANGain" Type="Int32" />
<asp:Parameter Direction="ReturnValue" Name="RETURN_VALUE" Type="Int32" />
</UpdateParameters>
</asp:SqlDataSource>

17
eDos/TaskNG.aspx.cs
View file

@ -53,6 +53,23 @@ namespace Rems2018
LoadAlarmComboBox("*", c2);
}
protected void RadGrid1_ItemCreated(object sender, GridItemEventArgs e)
{
if (e.Item is GridEditableItem && e.Item.IsInEditMode)
{
if (e.Item is GridEditFormInsertItem || e.Item is GridDataInsertItem)
{
// insert item
}
else
{
var x = e.Item.FindControl("lblTaskType_CODE") as TextBox;
x.ReadOnly = true;
// edit item
}
}
}
//protected void RadGrid1_ItemDataBound(object sender, GridItemEventArgs e)
//{
// if (e.Item.IsInEditMode)

10
eDos/TaskTypeStandard.aspx
View file

@ -1,23 +1,21 @@
<%@ Page Title="" Language="C#" MasterPageFile="~/Site.master" AutoEventWireup="true"
<%@ Page Title="TaskTypeStandard" Language="C#" MasterPageFile="~/Site.master" AutoEventWireup="true"
CodeBehind="TaskTypeStandard.aspx.cs" Inherits="Rems2018.TaskTypeStandard" %>
<asp:Content ID="Content1" ContentPlaceHolderID="head" runat="server">
</asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="ContentPlaceHolder1" runat="server">
<telerik:RadGrid ID="RadGrid2" runat="server"
CellSpacing="-1" GridLines="Both" AllowPaging="True"
CellSpacing="-1" GridLines="Both"
DataSourceID="sqlDSTaskTypeStandard"
AutoGenerateColumns="False">
<GroupingSettings CollapseAllTooltip="Collapse all groups"></GroupingSettings>
<GroupingSettings CollapseAllTooltip="Collapse all groups" CaseSensitive="false"></GroupingSettings>
<ExportSettings>
<Pdf PageWidth="">
</Pdf>
<Excel FileExtension="xlsx" Format="Xlsx" />
<Csv ColumnDelimiter="Semicolon" />
</ExportSettings>
<ClientSettings>
<Scrolling AllowScroll="True" UseStaticHeaders="True" ScrollHeight="700px" />
</ClientSettings>
<MasterTableView DataKeyNames="TaskTypeStandard_CODE" CommandItemDisplay="TopAndBottom" DataSourceID="sqlDSTaskTypeStandard" >
<CommandItemSettings ShowExportToExcelButton="True" ShowAddNewRecordButton="False" />
<Columns>

45
eDos/Worker.aspx
View file

@ -4,10 +4,13 @@
</asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="ContentPlaceHolder1" runat="server">
<telerik:RadComboBox ID="cmbPerson" runat="server" DataSourceID="sqlDSPerson" DataTextField="displayName" DataValueField="PersID" MarkFirstMatch="True" OnSelectedIndexChanged="cmbPerson_SelectedIndexChanged" OnDataBound="cmbPerson_DataBound" AutoPostBack="true" Width="208px">
</telerik:RadComboBox>
<telerik:RadSearchBox runat="server" ID="rs" DataTextField="DisplayName" DataValueField="PersID" DataSourceID="dsSearch" OnDataSourceSelect="rs_DataSourceSelect" OnSearch="rs_Search">
</telerik:RadSearchBox>
<asp:HiddenField runat="server" ID="hPersID" />
<%--<telerik:RadComboBox ID="cmbPerson" runat="server" DataSourceID="sqlDSPerson" DataTextField="displayName" DataValueField="PersID" MarkFirstMatch="True" OnSelectedIndexChanged="cmbPerson_SelectedIndexChanged" OnDataBound="cmbPerson_DataBound" AutoPostBack="true" Width="208px"/>--%>
<br />
<telerik:RadDataForm ID="RadDataForm1" runat="server" DataSourceID="sqlDsView" CssClass="rdfInlineBlock" DataKeyNames="PersID" RenderMode="Lightweight" OnNeedDataSource="RadDataForm1_NeedDataSource">
<telerik:RadDataForm ID="RadDataForm1" runat="server" DataSourceID="sqlDsView" CssClass="rdfInlineBlock" DataKeyNames="PersID" RenderMode="Lightweight" >
<LayoutTemplate>
<div class="RadDataForm RadDataForm_<%# Container.Skin %> rdfInlineBlock">
<div id="itemPlaceholder" runat="server">
@ -44,14 +47,6 @@
</td>
</tr>
<tr>
<td>
<asp:Label ID="Label11" runat="server" CssClass="rdfLabel rdfBlock" Text="NickName"></asp:Label>
</td>
<td>
<asp:Label ID="Label12" runat="server" CssClass="rdfFieldValue" Text='<%# Eval("NickName") %>' />
</td>
</tr>
<tr>
<td>
<asp:Label ID="Label14" runat="server" CssClass="rdfLabel rdfBlock" Text="Worker Type (W: Employee, E: Extern, S: Stage, J: Jobstudent, R: RvB, A : PhD en T:Interim) "></asp:Label>
@ -99,11 +94,11 @@
(To clear it go to Worker/Clear Visit Alarm and select the person. Clear all the alarm for that person)
</td>
<td>
<asp:Label runat="server" Text='<%# Eval("StationVisitIDLocked") %>' BorderStyle="Solid" BorderWidth="1px" Width="20px" Height="10px" />
<asp:Label runat="server" Text='<%# Eval("StationVisitIDLocked") %>' />
</td>
</tr>
<tr>
<td>4. Check that the Quiz, WBC, Medical.. are in orde ? If that is not the case you can give access for today via the button bellow.
<td>4. Check that the Quiz, WBC, Medical.. are ok ? If that is not the case you can give access for today via the button bellow.
</td>
</tr>
</table>
@ -252,7 +247,7 @@
</tr>
<tr>
<td style="font-weight: bold; column-width: 20em;">
<asp:Label ID="Label8" runat="server" CssClass="rdfLabel rdfBlock" Text="HP07G (µSv)"></asp:Label>
<asp:Label ID="Label8" runat="server" CssClass="rdfLabel rdfBlock" Text="HP07 (µSv)"></asp:Label>
</td>
<td>
<asp:Label ID="SUMHp07Dose_Y" runat="server" CssClass="rdfFieldValue" Text='<%# Eval("SUMHp07Dose_Y_2deci","{0:0.00}") %>' />
@ -290,10 +285,8 @@
</telerik:RadDataForm>
</telerik:RadPageView>
<telerik:RadPageView runat="server" ID="pVisits" TabIndex="1">
<telerik:RadGrid runat="server" ID="gridVisits" DataSourceID="sqlDSVisitPersId" CellSpacing="-1" GridLines="Both" AllowFilteringByColumn="True" AutoGenerateColumns="False" AllowSorting="True" AutoGenerateHierarchy="True" EnableHeaderContextAggregatesMenu="True" EnableHeaderContextFilterMenu="True" EnableHeaderContextMenu="True" OnNeedDataSource="gridVisits_NeedDataSource">
<telerik:RadGrid runat="server" ID="gridVisits" DataSourceID="sqlDSVisitPersId" CellSpacing="-1" GridLines="Both" AllowFilteringByColumn="True" AutoGenerateColumns="False" AllowSorting="True" AutoGenerateHierarchy="True" EnableHeaderContextAggregatesMenu="True" EnableHeaderContextFilterMenu="True" EnableHeaderContextMenu="True" >
<GroupingSettings CollapseAllTooltip="Collapse all groups"></GroupingSettings>
<ExportSettings>
<Pdf PageWidth="">
</Pdf>
@ -352,7 +345,7 @@
ConnectionString="<%$ ConnectionStrings:eDosConnectionString %>"
SelectCommand="PersonLimitSelect" SelectCommandType="StoredProcedure">
<SelectParameters>
<asp:ControlParameter ControlID="cmbPerson" Name="PersID" PropertyName="SelectedValue" />
<asp:ControlParameter ControlID="hPersID" Name="PersID" PropertyName="Value" />
</SelectParameters>
</asp:SqlDataSource>
@ -360,7 +353,7 @@
SelectCommand="PersonSelect" SelectCommandType="StoredProcedure"
UpdateCommand="PersonUpdate" UpdateCommandType="StoredProcedure">
<SelectParameters>
<asp:ControlParameter ControlID="cmbPerson" Name="PersID" PropertyName="SelectedValue" />
<asp:ControlParameter ControlID="hPersID" Name="PersID" PropertyName="Value" />
</SelectParameters>
<UpdateParameters>
<asp:Parameter Name="PersID" Type="Int32" />
@ -375,7 +368,19 @@
<asp:SqlDataSource ID="sqlDSVisitPersId" runat="server" ConnectionString="<%$ ConnectionStrings:eDosConnectionString %>"
SelectCommand="VisitPersIDSelect" SelectCommandType="StoredProcedure">
<SelectParameters>
<asp:ControlParameter ControlID="cmbPerson" Name="PersID" PropertyName="SelectedValue" Type="Int32" />
<asp:ControlParameter ControlID="hPersID" Name="PersID" PropertyName="Value" Type="Int32" />
</SelectParameters>
</asp:SqlDataSource>
<asp:SqlDataSource runat="server" ID="dsSearch" ConnectionString="<%$ ConnectionStrings:eDosConnectionString %>" SelectCommand="dbo.personSearch" SelectCommandType="StoredProcedure" >
<SelectParameters>
<asp:Parameter DefaultValue="" Name="search" Type="String" />
<asp:Parameter DefaultValue="*" Name="type" Type="String" />
<asp:Parameter DefaultValue="false" Name="showDeleted" Type="Boolean" />
</SelectParameters>
</asp:SqlDataSource>
</asp:Content>

35
eDos/Worker.aspx.cs
View file

@ -4,6 +4,7 @@ using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
using Telerik.Web.UI;
namespace Rems2018
{
@ -36,19 +37,37 @@ namespace Rems2018
RadDataForm1.DataBind();
}
protected void RadDataForm1_NeedDataSource(object sender, Telerik.Web.UI.RadDataFormNeedDataSourceEventArgs e)
protected void rs_DataSourceSelect(object sender, Telerik.Web.UI.SearchBoxDataSourceSelectEventArgs e)
{
SqlDataSource source = (SqlDataSource)e.DataSource;
var searchBox = sender as RadSearchBox;
//string likeCondition = string.Format("'{0}' + @filterString + '%'", searchBox.Filter == SearchBoxFilter.Contains ? "%" : "");
//string countCondition = e.ShowAllResults ? " " : " TOP 100 ";
//source.SelectCommand = string.Format("SELECT {0}* FROM [Products] WHERE [" + searchBox.DataTextField + "] LIKE {1}", countCondition, likeCondition);
//if (e.SelectedContextItem != null)
// source.SelectParameters["key"].DefaultValue = e.SelectedContextItem.Key;
//else
// source.SelectParameters["key"].DefaultValue = "*";
source.SelectParameters["search"].DefaultValue = searchBox.Text.Replace("'", "''");
}
protected void gridVisits_NeedDataSource(object sender, Telerik.Web.UI.GridNeedDataSourceEventArgs e)
protected void rs_Search(object sender, SearchBoxEventArgs e)
{
}
protected void testds_Selecting(object sender, SqlDataSourceSelectingEventArgs e)
{
int persid = 0;
if (e.Value != null)
hPersID.Value = e.Value;
else
{
if (int.TryParse(e.Text, out persid))
{
hPersID.Value = persid.ToString();
}
}
RadDataForm1.DataBind();
}
}
}

22
eDos/Worker.aspx.designer.cs generated
View file

@ -13,13 +13,22 @@ namespace Rems2018 {
public partial class Worker {
/// <summary>
/// cmbPerson control.
/// rs control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Telerik.Web.UI.RadComboBox cmbPerson;
protected global::Telerik.Web.UI.RadSearchBox rs;
/// <summary>
/// hPersID control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.HiddenField hPersID;
/// <summary>
/// RadDataForm1 control.
@ -119,5 +128,14 @@ namespace Rems2018 {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.SqlDataSource sqlDSVisitPersId;
/// <summary>
/// dsSearch control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.SqlDataSource dsSearch;
}
}

12
eDos/eDos.csproj
View file

@ -24,6 +24,8 @@
<UseGlobalApplicationHostFile />
<UpgradeBackupLocation />
<TargetFrameworkProfile />
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@ -270,6 +272,7 @@
<Content Include="Site.master" />
<Content Include="libman.json" />
<None Include="packages.config" />
<None Include="Properties\PublishProfiles\eDosTest.pubxml" />
<None Include="Properties\PublishProfiles\FolderProfile.pubxml" />
<None Include="web.Debug.config">
<DependentUpon>web.config</DependentUpon>
@ -316,7 +319,14 @@
<SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
</WebProjectProperties>
</FlavorProperties>
<UserProperties UseAjaxifiedTemplates="False" UseJQuerySupport="False" />
<UserProperties UseJQuerySupport="False" UseAjaxifiedTemplates="False" />
</VisualStudio>
</ProjectExtensions>
<Import Project="..\packages\Microsoft.VisualStudio.SlowCheetah.3.2.26\build\Microsoft.VisualStudio.SlowCheetah.targets" Condition="Exists('..\packages\Microsoft.VisualStudio.SlowCheetah.3.2.26\build\Microsoft.VisualStudio.SlowCheetah.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\Microsoft.VisualStudio.SlowCheetah.3.2.26\build\Microsoft.VisualStudio.SlowCheetah.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.VisualStudio.SlowCheetah.3.2.26\build\Microsoft.VisualStudio.SlowCheetah.targets'))" />
</Target>
</Project>

6
eDos/eDos.csproj.user
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
<IISExpressSSLPort />
@ -9,13 +9,13 @@
<IISExpressWindowsAuthentication />
<IISExpressUseClassicPipelineMode />
<UseGlobalApplicationHostFile />
<NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
<NameOfLastUsedPublishProfile>eDosTest</NameOfLastUsedPublishProfile>
</PropertyGroup>
<ProjectExtensions>
<VisualStudio>
<FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
<WebProjectProperties>
<StartPageUrl>ClearVisitAlarm.aspx</StartPageUrl>
<StartPageUrl>CommentToPerson.aspx</StartPageUrl>
<StartAction>SpecificPage</StartAction>
<AspNetDebugging>True</AspNetDebugging>
<SilverlightDebugging>False</SilverlightDebugging>

BIN
eDos/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
View file

Binary file not shown.

1
eDos/packages.config
View file

@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Microsoft.VisualStudio.SlowCheetah" version="3.2.26" targetFramework="net472" developmentDependency="true" />
<package id="Telerik.UI.for.AspNet.Ajax.Net45" version="2020.1.114" targetFramework="net472" />
</packages>

8
eDos/web.Debug.config
View file

@ -7,13 +7,13 @@
In the example below, the "SetAttributes" transform will change the value of
"connectionString" to use "ReleaseSQLServer" only when the "Match" locator
finds an attribute "name" that has a value of "MyDB".
-->
<connectionStrings>
<add name="MyDB"
connectionString="Data Source=ReleaseSQLServer;Initial Catalog=MyReleaseDB;Integrated Security=True"
<add name="eDosConnectionString"
connectionString="Data Source=sqlsrv3;Initial Catalog=eDos;Integrated Security=True" providerName="System.Data.SqlClient"
xdt:Transform="SetAttributes" xdt:Locator="Match(name)"/>
</connectionStrings>
-->
<system.web>
<!--
In the example below, the "Replace" transform will replace the entire

10
eDos/web.Release.config
View file

@ -7,13 +7,13 @@
In the example below, the "SetAttributes" transform will change the value of
"connectionString" to use "ReleaseSQLServer" only when the "Match" locator
finds an attribute "name" that has a value of "MyDB".
<connectionStrings>
<add name="MyDB"
connectionString="Data Source=ReleaseSQLServer;Initial Catalog=MyReleaseDB;Integrated Security=True"
-->
<connectionStrings>
<add name="eDosConnectionString"
connectionString="Data Source=HPHDB;Initial Catalog=eDos;Integrated Security=True" providerName="System.Data.SqlClient"
xdt:Transform="SetAttributes" xdt:Locator="Match(name)"/>
</connectionStrings>
-->
<system.web>
<compilation xdt:Transform="RemoveAttributes(debug)" />
<!--