From efbec5151c26205a988e580c8a8cabc48f147564 Mon Sep 17 00:00:00 2001
From: Luc Vandenbroucke <lvandenb@sckcen.be>
Date: Fri, 2 Jul 2021 12:04:25 +0200
Subject: [PATCH] afwerking

---
 eDos/AlarmEPD.aspx                            |  26 ++--
 eDos/BadgeNotFound.aspx                       |  10 +-
 eDos/CommentToInstallation.aspx               |  14 +-
 eDos/EPD.aspx                                 |  18 +--
 eDos/FNGainANGain.aspx                        |   8 +-
 eDos/LimitPerson.aspx                         |   8 +-
 eDos/Properties/licenses.licx                 |   1 +
 .../BR2 Cycli Doses per Person per Task.aspx  |  77 +++-------
 eDos/Rems/BR2Cycli.aspx                       |  36 +----
 eDos/Rems/RemsNeutron.aspx                    |  30 ++--
 eDos/Rems/RemsUnitTaskPerson.aspx             |  22 +--
 eDos/Rems/RemsUnitTaskPersonVisits.aspx       |  22 +--
 eDos/Reports/RemsByTaskPeriod.aspx            | 139 ++++++------------
 eDos/Site.master                              |   2 +-
 eDos/TaskBG.aspx                              |   4 +-
 eDos/TaskNG.aspx                              |   4 +-
 eDos/TaskTypeStandard.aspx                    |   4 +-
 eDos/WSumDose.aspx                            |  30 ++--
 eDos/Worker.aspx                              |  38 ++---
 eDos/eDos.csproj                              |  25 ++--
 eDos/eDos.csproj.user                         |   6 +-
 ...gnTimeResolveAssemblyReferencesInput.cache | Bin 10128 -> 10128 bytes
 .../Debug/eDos.csproj.CoreCompileInputs.cache |   2 +-
 eDos/packages.config                          |   2 +-
 eDos/web.config                               |  94 ++++++------
 eDos/web.config.template                      |  55 ++++---
 eDosWeb.sln                                   |   4 +-
 27 files changed, 279 insertions(+), 402 deletions(-)

diff --git a/eDos/AlarmEPD.aspx b/eDos/AlarmEPD.aspx
index 770ba56..6ee7a9a 100644
--- a/eDos/AlarmEPD.aspx
+++ b/eDos/AlarmEPD.aspx
@@ -22,31 +22,31 @@
         <MasterTableView DataKeyNames="ID_AlarmEPD" CommandItemDisplay="TopAndBottom" DataSourceID="sqlDSAlarmEPD" >
             <CommandItemSettings ShowExportToExcelButton="True" ShowAddNewRecordButton="False" />
             <Columns>
-                <telerik:GridBoundColumn DataField="ID_AlarmEPD" FilterControlAltText="Filter ID_AlarmEPD column" HeaderText="ID_AlarmEPD" SortExpression="ID_AlarmEPD" UniqueName="ID_AlarmEPD" DataType="System.Int32">
+                <telerik:GridBoundColumn DataField="ID_AlarmEPD" HeaderText="ID_AlarmEPD" SortExpression="ID_AlarmEPD" UniqueName="ID_AlarmEPD" DataType="System.Int32">
                 </telerik:GridBoundColumn>
-                <telerik:GridBoundColumn DataField="EPDRad" FilterControlAltText="Filter EPDRad column" HeaderText="EPDRad" SortExpression="EPDRad" UniqueName="EPDRad">
+                <telerik:GridBoundColumn DataField="EPDRad" HeaderText="EPDRad" SortExpression="EPDRad" UniqueName="EPDRad">
                 </telerik:GridBoundColumn>
-                <telerik:GridBoundColumn DataField="AlarmEPDName" FilterControlAltText="Filter AlarmEPDName column" HeaderText="AlarmEPDName" SortExpression="AlarmEPDName" UniqueName="AlarmEPDName">
+                <telerik:GridBoundColumn DataField="AlarmEPDName" HeaderText="AlarmEPDName" SortExpression="AlarmEPDName" UniqueName="AlarmEPDName">
                 </telerik:GridBoundColumn>
-                <telerik:GridBoundColumn DataField="Hp10Dose1" FilterControlAltText="Filter Hp10Dose1 column" HeaderText="Hp10(1)/HpG(1)" SortExpression="Hp10Dose1" UniqueName="Hp10Dose1" DataType="System.Double">
+                <telerik:GridBoundColumn DataField="Hp10Dose1" HeaderText="Hp10(1)/HpG(1)" SortExpression="Hp10Dose1" UniqueName="Hp10Dose1" DataType="System.Double">
                 </telerik:GridBoundColumn>
-                <telerik:GridBoundColumn DataField="Hp10Dose2" FilterControlAltText="Filter Hp10Dose2 column" HeaderText="Hp10(2)/HPG+HpN" SortExpression="Hp10Dose2" UniqueName="Hp10Dose2" DataType="System.Double">
+                <telerik:GridBoundColumn DataField="Hp10Dose2" HeaderText="Hp10(2)/HPG+HpN" SortExpression="Hp10Dose2" UniqueName="Hp10Dose2" DataType="System.Double">
                 </telerik:GridBoundColumn>
-                <telerik:GridBoundColumn DataField="Hp07Dose_bis" FilterControlAltText="Filter Hp07Dose_bis column" HeaderText="Hp07/HpN" SortExpression="Hp07Dose_bis" UniqueName="Hp07Dose_bis" DataType="System.Double">
+                <telerik:GridBoundColumn DataField="Hp07Dose_bis" HeaderText="Hp07/HpN" SortExpression="Hp07Dose_bis" UniqueName="Hp07Dose_bis" DataType="System.Double">
                 </telerik:GridBoundColumn>
-                <telerik:GridBoundColumn DataField="HP10Rate1ON" FilterControlAltText="Filter HP10Rate1ON column" HeaderText="HP10(1)On/HpG(1)On" SortExpression="HP10Rate1ON" UniqueName="HP10Rate1ON" DataType="System.Double">
+                <telerik:GridBoundColumn DataField="HP10Rate1ON" HeaderText="HP10(1)On/HpG(1)On" SortExpression="HP10Rate1ON" UniqueName="HP10Rate1ON" DataType="System.Double">
                 </telerik:GridBoundColumn>
-                <telerik:GridBoundColumn DataField="HP10Rate2ON" DataType="System.Double" FilterControlAltText="Filter HP10Rate2On column" HeaderText="HP10(2)ON/HpG(2)On" SortExpression="HP10Rate2ON" UniqueName="HP10Rate2ON">
+                <telerik:GridBoundColumn DataField="HP10Rate2ON" DataType="System.Double" HeaderText="HP10(2)ON/HpG(2)On" SortExpression="HP10Rate2ON" UniqueName="HP10Rate2ON">
                 </telerik:GridBoundColumn>
-                <telerik:GridBoundColumn DataField="HP07RateON" FilterControlAltText="Filter HP07RateON column" HeaderText="HP07On/HpNOn" SortExpression="HP07RateOn" UniqueName="HP07RateON" DataType="System.Double">
+                <telerik:GridBoundColumn DataField="HP07RateON" HeaderText="HP07On/HpNOn" SortExpression="HP07RateOn" UniqueName="HP07RateON" DataType="System.Double">
                 </telerik:GridBoundColumn>
-                <telerik:GridBoundColumn DataField="HP10Rate1OFF" DataType="System.Double" FilterControlAltText="Filter HP10Rate1OFF column" HeaderText="Hp10(1)Off/HpG(1)Off" SortExpression="HP10Rate1OFF" UniqueName="HP10Rate1OFF">
+                <telerik:GridBoundColumn DataField="HP10Rate1OFF" DataType="System.Double" HeaderText="Hp10(1)Off/HpG(1)Off" SortExpression="HP10Rate1OFF" UniqueName="HP10Rate1OFF">
                 </telerik:GridBoundColumn>
-                <telerik:GridBoundColumn DataField="HP10Rate2OFF" DataType="System.Double" FilterControlAltText="Filter HP10Rate2OFF column" HeaderText="Hp10(2)Off/HpG(2)Off" SortExpression="HP10Rate2OFF" UniqueName="HP10Rate2OFF" AllowFiltering="false">
+                <telerik:GridBoundColumn DataField="HP10Rate2OFF" DataType="System.Double" HeaderText="Hp10(2)Off/HpG(2)Off" SortExpression="HP10Rate2OFF" UniqueName="HP10Rate2OFF" AllowFiltering="false">
                 </telerik:GridBoundColumn>
-                <telerik:GridBoundColumn DataField="HP07RateOFF" DataType="System.Double" FilterControlAltText="Filter HP07RateOFF column" HeaderText="Hp07Off/HpNOff" SortExpression="HP07RateOFF" UniqueName="HP07RateOFF">
+                <telerik:GridBoundColumn DataField="HP07RateOFF" DataType="System.Double" HeaderText="Hp07Off/HpNOff" SortExpression="HP07RateOFF" UniqueName="HP07RateOFF">
                 </telerik:GridBoundColumn>
-                <telerik:GridBoundColumn DataField="MinWorkerDosisMargin" DataType="System.Double" FilterControlAltText="Filter MinWorkerDosisMargin column" HeaderText="MinWorkerDosisMargin" SortExpression="MinWorkerDosisMargin" UniqueName="MinWorkerDosisMargin">
+                <telerik:GridBoundColumn DataField="MinWorkerDosisMargin" DataType="System.Double" HeaderText="MinWorkerDosisMargin" SortExpression="MinWorkerDosisMargin" UniqueName="MinWorkerDosisMargin">
                 </telerik:GridBoundColumn>
             </Columns>
         </MasterTableView>
diff --git a/eDos/BadgeNotFound.aspx b/eDos/BadgeNotFound.aspx
index 03fe537..c7a1af7 100644
--- a/eDos/BadgeNotFound.aspx
+++ b/eDos/BadgeNotFound.aspx
@@ -21,15 +21,15 @@
         <MasterTableView DataKeyNames="CSN" CommandItemDisplay="TopAndBottom" DataSourceID="sqlDSBadgeNotFound" >
             <CommandItemSettings ShowExportToExcelButton="True" ShowAddNewRecordButton="False" />
             <Columns>
-                <telerik:GridBoundColumn DataField="CSN" FilterControlAltText="Filter CSN column" HeaderText="CSN Badge code" SortExpression="CSN" UniqueName="CSN" ReadOnly="True" Visible="False">
+                <telerik:GridBoundColumn DataField="CSN" HeaderText="CSN Badge code" SortExpression="CSN" UniqueName="CSN" ReadOnly="True" Visible="False">
                 </telerik:GridBoundColumn>
-                <telerik:GridBoundColumn DataField="Badge" FilterControlAltText="Filter Badge column" HeaderText="Badge" SortExpression="Badge" UniqueName="Badge">
+                <telerik:GridBoundColumn DataField="Badge" HeaderText="Badge" SortExpression="Badge" UniqueName="Badge">
                 </telerik:GridBoundColumn>
-                <telerik:GridBoundColumn DataField="LastRead" FilterControlAltText="Filter LastRead column" HeaderText="Last time Read" SortExpression="LastRead" UniqueName="LastRead" DataType="System.DateTime">
+                <telerik:GridBoundColumn DataField="LastRead" HeaderText="Last time Read" SortExpression="LastRead" UniqueName="LastRead" DataType="System.DateTime">
                 </telerik:GridBoundColumn>
-                <telerik:GridBoundColumn DataField="FirstRead" FilterControlAltText="Filter FirstRead column" HeaderText="First time Read" SortExpression="FirstRead" UniqueName="FirstRead" DataType="System.DateTime">
+                <telerik:GridBoundColumn DataField="FirstRead" HeaderText="First time Read" SortExpression="FirstRead" UniqueName="FirstRead" DataType="System.DateTime">
                 </telerik:GridBoundColumn>
-                <telerik:GridBoundColumn DataField="Counter" DataType="System.Int32" FilterControlAltText="Filter Counter column" HeaderText="Number of time Read" SortExpression="Counter" UniqueName="Counter">
+                <telerik:GridBoundColumn DataField="Counter" DataType="System.Int32" HeaderText="Number of time Read" SortExpression="Counter" UniqueName="Counter">
                 </telerik:GridBoundColumn>
             </Columns>
         </MasterTableView>
diff --git a/eDos/CommentToInstallation.aspx b/eDos/CommentToInstallation.aspx
index ee956b2..6d6ae72 100644
--- a/eDos/CommentToInstallation.aspx
+++ b/eDos/CommentToInstallation.aspx
@@ -16,25 +16,25 @@
  <telerik:GridButtonColumn CommandName="Edit" Text="Edit" ButtonCssClass="rgEdit" UniqueName="EditColumn" HeaderStyle-Width="30px">
                             <HeaderStyle Width="30px"></HeaderStyle>
                         </telerik:GridButtonColumn>
-                <telerik:GridBoundColumn DataField="ID_CommentToInstallation" DataType="System.Int32" HeaderText="ID_CommentToInstallation" UniqueName="ID_CommentToInstallation" FilterControlAltText="Filter ID_CommentToInstallation column" ReadOnly="True" SortExpression="ID_CommentToInstallation">
+                <telerik:GridBoundColumn DataField="ID_CommentToInstallation" DataType="System.Int32" HeaderText="ID_CommentToInstallation" UniqueName="ID_CommentToInstallation" ReadOnly="True" SortExpression="ID_CommentToInstallation">
                 </telerik:GridBoundColumn>
-                <telerik:GridBoundColumn DataField="FNameAgent" HeaderText="Registered by (First Name)" UniqueName="FNameAgent" FilterControlAltText="Filter FNameAgent column" SortExpression="FNameAgent">
+                <telerik:GridBoundColumn DataField="FNameAgent" HeaderText="Registered by (First Name)" UniqueName="FNameAgent" SortExpression="FNameAgent">
                 </telerik:GridBoundColumn>
-                <telerik:GridBoundColumn DataField="LNameAgent" FilterControlAltText="Filter LNameAgent column" HeaderText="Registered by Last Name" SortExpression="LNameAgent" UniqueName="LNameAgent">
+                <telerik:GridBoundColumn DataField="LNameAgent" HeaderText="Registered by Last Name" SortExpression="LNameAgent" UniqueName="LNameAgent">
                 </telerik:GridBoundColumn>
                 <telerik:GridBoundColumn DataField="Inst_CODE" HeaderText="Code" UniqueName="Inst_CODE"  SortExpression="Inst_CODE">
                 </telerik:GridBoundColumn>
-                <telerik:GridBoundColumn DataField="InstallationName" HeaderText="InstallationName" UniqueName="InstallationName" FilterControlAltText="Filter InstallationName column" SortExpression="InstallationName" ReadOnly="true">
+                <telerik:GridBoundColumn DataField="InstallationName" HeaderText="InstallationName" UniqueName="InstallationName" SortExpression="InstallationName" ReadOnly="true">
                 </telerik:GridBoundColumn>
-                <telerik:GridBoundColumn DataField="Comment" HeaderText="Comment" UniqueName="Comment" FilterControlAltText="Filter Comment column" SortExpression="Comment">
+                <telerik:GridBoundColumn DataField="Comment" HeaderText="Comment" UniqueName="Comment" SortExpression="Comment">
                 </telerik:GridBoundColumn>
-                <telerik:GridBoundColumn DataField="CommentDate" HeaderText="CommentDate" UniqueName="CommentDate" FilterControlAltText="Filter CommentDate column" SortExpression="CommentDate" DataType="System.DateTime">
+                <telerik:GridBoundColumn DataField="CommentDate" HeaderText="CommentDate" UniqueName="CommentDate" SortExpression="CommentDate" DataType="System.DateTime">
                 </telerik:GridBoundColumn>
 
                 <telerik:GridBoundColumn DataField="CommentDateStart" HeaderText="CommentDateStart" SortExpression="CommentDateStart" UniqueName="CommentDateStart" DataType="System.DateTime" DataFormatString="{0:yyyy-MM-dd}">
                 </telerik:GridBoundColumn>
 
-                <telerik:GridBoundColumn DataField="CommentDateSTOP" DataType="System.DateTime" FilterControlAltText="Filter CommentDateSTOP column" HeaderText="CommentDateSTOP" SortExpression="CommentDateSTOP" UniqueName="CommentDateSTOP">
+                <telerik:GridBoundColumn DataField="CommentDateSTOP" DataType="System.DateTime" HeaderText="CommentDateSTOP" SortExpression="CommentDateSTOP" UniqueName="CommentDateSTOP">
                 </telerik:GridBoundColumn>
 
             </Columns>
diff --git a/eDos/EPD.aspx b/eDos/EPD.aspx
index 9e91d2e..1a41fb6 100644
--- a/eDos/EPD.aspx
+++ b/eDos/EPD.aspx
@@ -18,25 +18,25 @@
         <CommandItemSettings ShowExportToExcelButton="True" ShowAddNewRecordButton="False" />
         <Columns>
        
-            <telerik:GridBoundColumn DataField="EPDTypeDescription" FilterControlAltText="Filter EPDTypeDescription column" HeaderText="EPDTypeDescription" SortExpression="EPDTypeDescription" UniqueName="EPDTypeDescription">
+            <telerik:GridBoundColumn DataField="EPDTypeDescription" HeaderText="EPDTypeDescription" SortExpression="EPDTypeDescription" UniqueName="EPDTypeDescription">
             </telerik:GridBoundColumn>
 
-            <telerik:GridBoundColumn DataField="EPD_sn" FilterControlAltText="Filter EPD_sn column" HeaderText="EPD_sn" SortExpression="EPD_sn" UniqueName="EPD_sn">
+            <telerik:GridBoundColumn DataField="EPD_sn" HeaderText="EPD_sn" SortExpression="EPD_sn" UniqueName="EPD_sn">
             </telerik:GridBoundColumn>
-            <telerik:GridBoundColumn DataField="EPD_InternalID" DataType="System.Int32" FilterControlAltText="Filter EPD_InternalID column" HeaderText="EPD_InternalID" SortExpression="EPD_InternalID" UniqueName="EPD_InternalID">
+            <telerik:GridBoundColumn DataField="EPD_InternalID" DataType="System.Int32" HeaderText="EPD_InternalID" SortExpression="EPD_InternalID" UniqueName="EPD_InternalID">
             </telerik:GridBoundColumn>
-            <telerik:GridBoundColumn DataField="EPDNextCalibrationDate" FilterControlAltText="Filter EPDNextCalibrationDate column" HeaderText="EPDNextCalibrationDate" SortExpression="EPDNextCalibrationDate" UniqueName="EPDNextCalibrationDate" DataType="System.DateTime">
+            <telerik:GridBoundColumn DataField="EPDNextCalibrationDate" HeaderText="EPDNextCalibrationDate" SortExpression="EPDNextCalibrationDate" UniqueName="EPDNextCalibrationDate" DataType="System.DateTime">
             </telerik:GridBoundColumn>
-            <telerik:GridBoundColumn DataField="LokalToestellen" FilterControlAltText="Filter LokalToestellen column" HeaderText="Lokal bij TOESTELLEN" SortExpression="LokalToestellen" UniqueName="LokalToestellen">
+            <telerik:GridBoundColumn DataField="LokalToestellen" HeaderText="Lokal bij TOESTELLEN" SortExpression="LokalToestellen" UniqueName="LokalToestellen">
             </telerik:GridBoundColumn>
-            <telerik:GridBoundColumn DataField="InstallationName" FilterControlAltText="Filter InstallationName column" HeaderText="Last Used Installation" SortExpression="InstallationName" UniqueName="InstallationName">
+            <telerik:GridBoundColumn DataField="InstallationName" HeaderText="Last Used Installation" SortExpression="InstallationName" UniqueName="InstallationName">
             </telerik:GridBoundColumn>
-            <telerik:GridBoundColumn DataField="LastUsedEntry" FilterControlAltText="Filter LastUsedEntry column" HeaderText="Last Used Entry" SortExpression="LastUsedEntry" UniqueName="LastUsedEntry" DataType="System.DateTime">
+            <telerik:GridBoundColumn DataField="LastUsedEntry" HeaderText="Last Used Entry" SortExpression="LastUsedEntry" UniqueName="LastUsedEntry" DataType="System.DateTime">
             </telerik:GridBoundColumn>
-             <telerik:GridBoundColumn DataField="LastUsedExit" FilterControlAltText="Filter LastUsedExit column" HeaderText="Last Used Exit" SortExpression="LastUsedExit" UniqueName="LastUsedExit" DataType="System.DateTime">
+             <telerik:GridBoundColumn DataField="LastUsedExit" HeaderText="Last Used Exit" SortExpression="LastUsedExit" UniqueName="LastUsedExit" DataType="System.DateTime">
             </telerik:GridBoundColumn>         
 
-            <telerik:GridBoundColumn DataField="EPDstatus" FilterControlAltText="Filter EPDstatus column" HeaderText="EPDstatus" SortExpression="EPDstatus" UniqueName="EPDstatus">
+            <telerik:GridBoundColumn DataField="EPDstatus" HeaderText="EPDstatus" SortExpression="EPDstatus" UniqueName="EPDstatus">
             </telerik:GridBoundColumn>
 
         </Columns> 
diff --git a/eDos/FNGainANGain.aspx b/eDos/FNGainANGain.aspx
index 2ff372b..a97a764 100644
--- a/eDos/FNGainANGain.aspx
+++ b/eDos/FNGainANGain.aspx
@@ -20,13 +20,13 @@
         <MasterTableView DataKeyNames="ID_FNGAinANGain" CommandItemDisplay="TopAndBottom" DataSourceID="sqlDSFNGainANGain">
             <CommandItemSettings ShowExportToExcelButton="True" ShowAddNewRecordButton="False" />
             <Columns>
-                <telerik:GridBoundColumn DataField="ID_FNGAinANGain" FilterControlAltText="Filter ID_FNGAinANGain column" HeaderText="ID" SortExpression="ID_FNGAinANGain" UniqueName="ID_FNGAinANGain" DataType="System.Int32" ReadOnly="True">
+                <telerik:GridBoundColumn DataField="ID_FNGAinANGain" HeaderText="ID" SortExpression="ID_FNGAinANGain" UniqueName="ID_FNGAinANGain" DataType="System.Int32" ReadOnly="True">
                 </telerik:GridBoundColumn>
-                <telerik:GridBoundColumn DataField="FNGain_ANGainValue" FilterControlAltText="Filter FNGain_ANGainValue column" HeaderText="FNGain and ANGain Value" SortExpression="FNGain_ANGainValue" UniqueName="FNGain_ANGainValue" DataType="System.Double" DataFormatString="{0:0.00}"  >
+                <telerik:GridBoundColumn DataField="FNGain_ANGainValue" HeaderText="FNGain and ANGain Value" SortExpression="FNGain_ANGainValue" UniqueName="FNGain_ANGainValue" DataType="System.Double" DataFormatString="{0:0.00}"  >
                 </telerik:GridBoundColumn>
-                <telerik:GridBoundColumn DataField="InstallationActivity" FilterControlAltText="Filter InstallationActivity column" HeaderText="Installation and/or Activity" SortExpression="InstallationActivity" UniqueName="InstallationActivity">
+                <telerik:GridBoundColumn DataField="InstallationActivity" HeaderText="Installation and/or Activity" SortExpression="InstallationActivity" UniqueName="InstallationActivity">
                 </telerik:GridBoundColumn>
-                <telerik:GridBoundColumn DataField="Description" FilterControlAltText="Filter Description column" HeaderText="Description" SortExpression="Description" UniqueName="Description">
+                <telerik:GridBoundColumn DataField="Description" HeaderText="Description" SortExpression="Description" UniqueName="Description">
                 </telerik:GridBoundColumn>
             </Columns>
         </MasterTableView>
diff --git a/eDos/LimitPerson.aspx b/eDos/LimitPerson.aspx
index ffc8bd7..e7d7b83 100644
--- a/eDos/LimitPerson.aspx
+++ b/eDos/LimitPerson.aspx
@@ -18,13 +18,13 @@
         <CommandItemSettings ShowExportToExcelButton="True" />
         <Columns>
        
-            <telerik:GridBoundColumn DataField="ConCode" FilterControlAltText="Filter ConCode column" HeaderText="Code at the medical service" SortExpression="ConCode" UniqueName="ConCode" DataType="System.Double">
+            <telerik:GridBoundColumn DataField="ConCode" HeaderText="Code at the medical service" SortExpression="ConCode" UniqueName="ConCode" DataType="System.Double">
             </telerik:GridBoundColumn>
-            <telerik:GridBoundColumn DataField="YearToDateLimit" FilterControlAltText="Filter YearToDateLimit column" HeaderText="YearToDateLimit" SortExpression="YearToDateLimit" UniqueName="YearToDateLimit">
+            <telerik:GridBoundColumn DataField="YearToDateLimit" HeaderText="YearToDateLimit" SortExpression="YearToDateLimit" UniqueName="YearToDateLimit">
             </telerik:GridBoundColumn>
-            <telerik:GridBoundColumn DataField="QuarterLimit" FilterControlAltText="Filter QuarterLimit column" HeaderText="QuarterLimit" SortExpression="QuarterLimit" UniqueName="QuarterLimit" DataType="System.Double">
+            <telerik:GridBoundColumn DataField="QuarterLimit" HeaderText="QuarterLimit" SortExpression="QuarterLimit" UniqueName="QuarterLimit" DataType="System.Double">
             </telerik:GridBoundColumn>
-            <telerik:GridBoundColumn DataField="MonthlyLimit" FilterControlAltText="Filter MonthlyLimit column" HeaderText="MonthlyLimit" SortExpression="MonthlyLimit" UniqueName="MonthlyLimit" DataType="System.Double">
+            <telerik:GridBoundColumn DataField="MonthlyLimit" HeaderText="MonthlyLimit" SortExpression="MonthlyLimit" UniqueName="MonthlyLimit" DataType="System.Double">
             </telerik:GridBoundColumn>
             <telerik:GridCheckBoxColumn DataField="AccessAllow" DataType="System.Boolean" HeaderText="AccessAllow" UniqueName="AccessAllow">
             </telerik:GridCheckBoxColumn>
diff --git a/eDos/Properties/licenses.licx b/eDos/Properties/licenses.licx
index fa139bb..ce57b54 100644
--- a/eDos/Properties/licenses.licx
+++ b/eDos/Properties/licenses.licx
@@ -1,3 +1,4 @@
+Telerik.Web.UI.RadGrid, Telerik.Web.UI, Version=2021.2.616.45, Culture=neutral, PublicKeyToken=121fae78165ba3d4
 Telerik.Web.UI.RadFormDecorator, Telerik.Web.UI, Version=2020.1.114.45, Culture=neutral, PublicKeyToken=121fae78165ba3d4
 Telerik.Web.UI.RadDatePicker, Telerik.Web.UI, Version=2020.1.114.45, Culture=neutral, PublicKeyToken=121fae78165ba3d4
 Telerik.Web.UI.RadWindowManager, Telerik.Web.UI, Version=2020.1.114.45, Culture=neutral, PublicKeyToken=121fae78165ba3d4
diff --git a/eDos/Rems/BR2 Cycli Doses per Person per Task.aspx b/eDos/Rems/BR2 Cycli Doses per Person per Task.aspx
index 12a1551..578fab6 100644
--- a/eDos/Rems/BR2 Cycli Doses per Person per Task.aspx	
+++ b/eDos/Rems/BR2 Cycli Doses per Person per Task.aspx	
@@ -1,72 +1,31 @@
 <%@ Page Title="BR2 Cycli Doses Person / Task" Language="C#" MasterPageFile="~/Site.master" AutoEventWireup="true" CodeBehind="BR2 Cycli Doses per Person per Task.aspx.cs" Inherits="Rems2018.Rems.BR2_Cycli_Doses_per_Person_per_Task" %>
 <asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" runat="server">
  
-    <telerik:RadGrid ID="RadGrid1" runat="server" AllowFilteringByColumn="True" AllowSorting="True" AutoGenerateColumns="False" CellSpacing="0" DataSourceID="SqlDataSource1" GridLines="None">
+    <telerik:RadGrid ID="RadGrid1" runat="server" AllowFilteringByColumn="True" AllowSorting="True" AutoGenerateColumns="False" DataSourceID="SqlDataSource1">
         <ExportSettings ExportOnlyData="True" HideStructureColumns="True" IgnorePaging="True" OpenInNewWindow="True">
-            <Pdf PageWidth="">
-            </Pdf>
             <Excel Format="ExcelML" />
         </ExportSettings>
         <MasterTableView CommandItemDisplay="Top" DataSourceID="SqlDataSource1">
             <CommandItemSettings ShowAddNewRecordButton="False" ShowExportToExcelButton="True" />
             <Columns>
-                <telerik:GridBoundColumn DataField="year" DataType="System.Int32" FilterControlAltText="Filter year column" HeaderText="year" SortExpression="year" UniqueName="year">
-                    <ColumnValidationSettings>
-                        <ModelErrorMessage Text="" />
-                    </ColumnValidationSettings>
-                </telerik:GridBoundColumn>
-                <telerik:GridBoundColumn DataField="tp" FilterControlAltText="Filter tp column" HeaderText="tp" SortExpression="tp" UniqueName="tp">
-                    <ColumnValidationSettings>
-                        <ModelErrorMessage Text="" />
-                    </ColumnValidationSettings>
-                </telerik:GridBoundColumn>
-                <telerik:GridBoundColumn DataField="seq" DataType="System.Int32" FilterControlAltText="Filter seq column" HeaderText="seq" SortExpression="seq" UniqueName="seq">
-                    <ColumnValidationSettings>
-                        <ModelErrorMessage Text="" />
-                    </ColumnValidationSettings>
-                </telerik:GridBoundColumn>
-                <telerik:GridBoundColumn DataField="hpid" FilterControlAltText="Filter hpid column" HeaderText="hpid" SortExpression="hpid" UniqueName="hpid">
-                    <ColumnValidationSettings>
-                        <ModelErrorMessage Text="" />
-                    </ColumnValidationSettings>
-                </telerik:GridBoundColumn>
-                <telerik:GridBoundColumn DataField="task" FilterControlAltText="Filter task column" HeaderText="task" ReadOnly="True" SortExpression="task" UniqueName="task">
-                    <ColumnValidationSettings>
-                        <ModelErrorMessage Text="" />
-                    </ColumnValidationSettings>
-                </telerik:GridBoundColumn>
-                <telerik:GridBoundColumn DataField="hptotal" DataType="System.Decimal" FilterControlAltText="Filter hptotal column" HeaderText="hptotal" ReadOnly="True" SortExpression="hptotal" UniqueName="hptotal">
-                    <ColumnValidationSettings>
-                        <ModelErrorMessage Text="" />
-                    </ColumnValidationSettings>
-                </telerik:GridBoundColumn>
-                <telerik:GridBoundColumn DataField="routine" DataType="System.Decimal" FilterControlAltText="Filter routine column" HeaderText="routine" ReadOnly="True" SortExpression="routine" UniqueName="routine">
-                    <ColumnValidationSettings>
-                        <ModelErrorMessage Text="" />
-                    </ColumnValidationSettings>
-                </telerik:GridBoundColumn>
-                <telerik:GridBoundColumn DataField="hpalara" DataType="System.Decimal" FilterControlAltText="Filter hpalara column" HeaderText="hpalara" ReadOnly="True" SortExpression="hpalara" UniqueName="hpalara">
-                    <ColumnValidationSettings>
-                        <ModelErrorMessage Text="" />
-                    </ColumnValidationSettings>
-                </telerik:GridBoundColumn>
-                <telerik:GridBoundColumn DataField="name" FilterControlAltText="Filter name column" HeaderText="name" ReadOnly="True" SortExpression="name" UniqueName="name">
-                    <ColumnValidationSettings>
-                        <ModelErrorMessage Text="" />
-                    </ColumnValidationSettings>
-                </telerik:GridBoundColumn>
-                <telerik:GridBoundColumn DataField="totalhours" DataType="System.Decimal" FilterControlAltText="Filter totalhours column" HeaderText="totalhours" ReadOnly="True" SortExpression="totalhours" UniqueName="totalhours">
-                    <ColumnValidationSettings>
-                        <ModelErrorMessage Text="" />
-                    </ColumnValidationSettings>
-                </telerik:GridBoundColumn>
-                <telerik:GridBoundColumn DataField="alarahours" DataType="System.Decimal" FilterControlAltText="Filter alarahours column" HeaderText="alarahours" ReadOnly="True" SortExpression="alarahours" UniqueName="alarahours">
-                    <ColumnValidationSettings>
-                        <ModelErrorMessage Text="" />
-                    </ColumnValidationSettings>
-                </telerik:GridBoundColumn>
+                <telerik:GridBoundColumn DataField="year" DataType="System.Int32" HeaderText="year" SortExpression="year" UniqueName="year" HeaderStyle-Width="60px" FilterControlWidth="40px"  />
+                <telerik:GridBoundColumn DataField="tp" HeaderText="tp" SortExpression="tp" UniqueName="tp" HeaderStyle-Width="60px" FilterControlWidth="40px"  />
+                <telerik:GridBoundColumn DataField="seq" DataType="System.Int32" HeaderText="seq" SortExpression="seq" UniqueName="seq" HeaderStyle-Width="60px" FilterControlWidth="40px"  />
+                <telerik:GridBoundColumn DataField="persid" HeaderText="PersID" SortExpression="persid" UniqueName="persid" HeaderStyle-Width="60px" FilterControlWidth="40px"  />
+                <telerik:GridBoundColumn DataField="task" HeaderText="Task" ReadOnly="True" SortExpression="task" UniqueName="task" HeaderStyle-Width="120px" FilterControlWidth="100px"  />
+                <telerik:GridBoundColumn DataField="hpTotal" DataType="System.Decimal" HeaderText="hptotal" ReadOnly="True" SortExpression="hptotal" UniqueName="hptotal" AllowFiltering="false" />
+                <telerik:GridBoundColumn DataField="routine" DataType="System.Decimal" HeaderText="routine" ReadOnly="True" SortExpression="routine" UniqueName="routine" AllowFiltering="false"/>
+                <telerik:GridBoundColumn DataField="hpalara" DataType="System.Decimal" HeaderText="hpalara" ReadOnly="True" SortExpression="hpalara" UniqueName="hpalara" AllowFiltering="false"/>
+                <telerik:GridBoundColumn DataField="name" HeaderText="name" ReadOnly="True" SortExpression="name" UniqueName="name" />
+                <telerik:GridBoundColumn DataField="totalhours" DataType="System.Decimal" HeaderText="totalhours" ReadOnly="True" SortExpression="totalhours" UniqueName="totalhours" />
+                <telerik:GridBoundColumn DataField="alarahours" DataType="System.Decimal" HeaderText="alarahours" ReadOnly="True" SortExpression="alarahours" UniqueName="alarahours" />
             </Columns>
         </MasterTableView>
     </telerik:RadGrid>
-    <asp:SqlDataSource ID="SqlDataSource1" runat="server" ConnectionString="<%$ ConnectionStrings:RemsConnectionString %>" SelectCommand="ReportBR2PersDoseTask" SelectCommandType="StoredProcedure"></asp:SqlDataSource>
+    <asp:SqlDataSource ID="SqlDataSource1" runat="server" ConnectionString="<%$ ConnectionStrings:eDosConnectionString %>" 
+        SelectCommand="ReportBR2PersDoseTask" SelectCommandType="StoredProcedure">
+        <SelectParameters>
+            <asp:Parameter DefaultValue="2021" Name="year" Type="Int32" />
+        </SelectParameters>
+</asp:SqlDataSource>
 </asp:Content>
diff --git a/eDos/Rems/BR2Cycli.aspx b/eDos/Rems/BR2Cycli.aspx
index 14bdf02..f7c2cf6 100644
--- a/eDos/Rems/BR2Cycli.aspx
+++ b/eDos/Rems/BR2Cycli.aspx
@@ -7,36 +7,12 @@
         </ExportSettings>
         <MasterTableView AllowAutomaticUpdates="True" CommandItemDisplay="Top" DataKeyNames="id" DataSourceID="SqlDSRems5">
             <Columns>
-                <telerik:GridBoundColumn DataField="id" DataType="System.Int32" FilterControlAltText="Filter id column" HeaderText="id" ReadOnly="True" SortExpression="id" UniqueName="id">
-                    <ColumnValidationSettings>
-                        <ModelErrorMessage Text="" />
-                    </ColumnValidationSettings>
-                </telerik:GridBoundColumn>
-                <telerik:GridBoundColumn DataField="tp" FilterControlAltText="Filter tp column" HeaderText="tp" SortExpression="tp" UniqueName="tp">
-                    <ColumnValidationSettings>
-                        <ModelErrorMessage Text="" />
-                    </ColumnValidationSettings>
-                </telerik:GridBoundColumn>
-                <telerik:GridBoundColumn DataField="year" DataType="System.Int32" FilterControlAltText="Filter year column" HeaderText="year" SortExpression="year" UniqueName="year">
-                    <ColumnValidationSettings>
-                        <ModelErrorMessage Text="" />
-                    </ColumnValidationSettings>
-                </telerik:GridBoundColumn>
-                <telerik:GridBoundColumn DataField="seq" DataType="System.Int32" FilterControlAltText="Filter seq column" HeaderText="seq" SortExpression="seq" UniqueName="seq">
-                    <ColumnValidationSettings>
-                        <ModelErrorMessage Text="" />
-                    </ColumnValidationSettings>
-                </telerik:GridBoundColumn>
-                <telerik:GridBoundColumn DataField="van" DataType="System.DateTime" FilterControlAltText="Filter van column" HeaderText="van" SortExpression="van" UniqueName="van">
-                    <ColumnValidationSettings>
-                        <ModelErrorMessage Text="" />
-                    </ColumnValidationSettings>
-                </telerik:GridBoundColumn>
-                <telerik:GridBoundColumn DataField="tot" DataType="System.DateTime" FilterControlAltText="Filter tot column" HeaderText="tot" SortExpression="tot" UniqueName="tot">
-                    <ColumnValidationSettings>
-                        <ModelErrorMessage Text="" />
-                    </ColumnValidationSettings>
-                </telerik:GridBoundColumn>
+                <telerik:GridBoundColumn DataField="id" DataType="System.Int32" HeaderText="id" ReadOnly="True" SortExpression="id" UniqueName="id" HeaderStyle-Width="50px" AllowFiltering="false" />
+                <telerik:GridBoundColumn DataField="tp" HeaderText="tp" SortExpression="tp" UniqueName="tp" HeaderStyle-Width="30px" AllowFiltering="false" />
+                <telerik:GridBoundColumn DataField="year" DataType="System.Int32" HeaderText="year" SortExpression="year" UniqueName="year" HeaderStyle-Width="50px" AllowFiltering="true" />
+                <telerik:GridBoundColumn DataField="seq" DataType="System.Int32" HeaderText="seq" SortExpression="seq" UniqueName="seq" />
+                <telerik:GridBoundColumn DataField="van" DataType="System.DateTime" HeaderText="van" SortExpression="van" UniqueName="van"  />
+                <telerik:GridBoundColumn DataField="tot" DataType="System.DateTime" HeaderText="tot" SortExpression="tot" UniqueName="tot" />
             </Columns>
         </MasterTableView>
 </telerik:RadGrid>
diff --git a/eDos/Rems/RemsNeutron.aspx b/eDos/Rems/RemsNeutron.aspx
index f0cdc3a..1f511a9 100644
--- a/eDos/Rems/RemsNeutron.aspx
+++ b/eDos/Rems/RemsNeutron.aspx
@@ -7,26 +7,18 @@
         <MasterTableView DataSourceID="SqlDataSource1" CommandItemDisplay="Top" ShowFooter="True" ShowGroupFooter="True">
             <CommandItemSettings ShowExportToExcelButton="True" ShowAddNewRecordButton="False" />
             <Columns>
-                <telerik:GridBoundColumn DataField="persid" FilterControlAltText="Filter persid column" HeaderText="persid" SortExpression="persid" UniqueName="persid">
-                </telerik:GridBoundColumn>
-                <telerik:GridBoundColumn DataField="name" FilterControlAltText="Filter name column" HeaderText="Name" ReadOnly="True" SortExpression="name" UniqueName="name">
-                </telerik:GridBoundColumn>
-                <telerik:GridBoundColumn DataField="Task" FilterControlAltText="Filter Task column" HeaderText="Task" SortExpression="Task" UniqueName="Task">
-                </telerik:GridBoundColumn>
-                <telerik:GridBoundColumn DataField="description" FilterControlAltText="Filter description column" HeaderText="Description" SortExpression="description" UniqueName="description">
-                </telerik:GridBoundColumn>
-                <telerik:GridBoundColumn DataField="hp" DataType="System.Decimal" FilterControlAltText="Filter hp column" HeaderText="hp" SortExpression="hp" UniqueName="hp">
-                </telerik:GridBoundColumn>
-                <telerik:GridBoundColumn DataField="hpg" DataType="System.Decimal" FilterControlAltText="Filter hpg column" HeaderText="hpg" SortExpression="hpg" UniqueName="hpg" Aggregate="Sum">
-                </telerik:GridBoundColumn>
-                <telerik:GridBoundColumn DataField="hpn" DataType="System.Decimal" FilterControlAltText="Filter hpn column" HeaderText="hpn" SortExpression="hpn" UniqueName="hpn" Aggregate="Sum">
-                </telerik:GridBoundColumn>
-                <telerik:GridBoundColumn DataField="StartTime" DataType="System.DateTime" FilterControlAltText="Filter StartTime column" HeaderText="StartTime" SortExpression="StartTime" UniqueName="StartTime" Aggregate="Min">
-                </telerik:GridBoundColumn>
-                <telerik:GridBoundColumn DataField="EndTime" DataType="System.DateTime" FilterControlAltText="Filter EndTime column" HeaderText="EndTime" SortExpression="EndTime" UniqueName="EndTime" Aggregate="Max" FooterText="Last End">
-                </telerik:GridBoundColumn>
+                <telerik:GridBoundColumn DataField="persid" HeaderText="persid" SortExpression="persid" UniqueName="persid" />
+                <telerik:GridBoundColumn DataField="name" HeaderText="Name" ReadOnly="True" SortExpression="name" UniqueName="name" />
+                <telerik:GridBoundColumn DataField="Task" HeaderText="Task" SortExpression="Task" UniqueName="Task" />
+                <telerik:GridBoundColumn DataField="description" HeaderText="Description" SortExpression="description" UniqueName="description" />
+                <telerik:GridBoundColumn DataField="hp" DataType="System.Decimal" HeaderText="hp" SortExpression="hp" UniqueName="hp" />
+                <telerik:GridBoundColumn DataField="hpg" DataType="System.Decimal" HeaderText="hpg" SortExpression="hpg" UniqueName="hpg" Aggregate="Sum" />
+                <telerik:GridBoundColumn DataField="hpn" DataType="System.Decimal" HeaderText="hpn" SortExpression="hpn" UniqueName="hpn" Aggregate="Sum" />
+                <telerik:GridBoundColumn DataField="StartTime" DataType="System.DateTime" HeaderText="StartTime" SortExpression="StartTime" UniqueName="StartTime" Aggregate="Min" />
+                <telerik:GridBoundColumn DataField="EndTime" DataType="System.DateTime" HeaderText="EndTime" SortExpression="EndTime" UniqueName="EndTime" Aggregate="Max" FooterText="Last End" />
             </Columns>
         </MasterTableView>
 </telerik:RadGrid>
-<asp:SqlDataSource ID="SqlDataSource1" runat="server" ConnectionString="<%$ ConnectionStrings:remsConnectionString %>" SelectCommand="IsabelleReporttEpd4" SelectCommandType="StoredProcedure"></asp:SqlDataSource>
+<asp:SqlDataSource ID="SqlDataSource1" runat="server" ConnectionString="<%$ ConnectionStrings:remsConnectionString %>" 
+    SelectCommand="IsabelleReporttEpd4" SelectCommandType="StoredProcedure"></asp:SqlDataSource>
 </asp:Content>
diff --git a/eDos/Rems/RemsUnitTaskPerson.aspx b/eDos/Rems/RemsUnitTaskPerson.aspx
index 1ee4872..b0edebd 100644
--- a/eDos/Rems/RemsUnitTaskPerson.aspx
+++ b/eDos/Rems/RemsUnitTaskPerson.aspx
@@ -23,57 +23,57 @@
         <MasterTableView DataSourceID="SqlDSRems" CommandItemDisplay="Top">
             <CommandItemSettings ShowAddNewRecordButton="False" ShowExportToExcelButton="True" ShowExportToWordButton="True" />
             <Columns>
-                <telerik:GridBoundColumn DataField="hpid" FilterControlAltText="Filter hpid column" HeaderText="hpid" SortExpression="hpid" UniqueName="hpid">
+                <telerik:GridBoundColumn DataField="hpid" HeaderText="hpid" SortExpression="hpid" UniqueName="hpid">
                     <ColumnValidationSettings>
                         <ModelErrorMessage Text="" />
                     </ColumnValidationSettings>
                 </telerik:GridBoundColumn>
-                <telerik:GridBoundColumn DataField="persGroup" FilterControlAltText="Filter persGroup column" HeaderText="persGroup" SortExpression="persGroup" UniqueName="persGroup" FilterControlWidth="50px">
+                <telerik:GridBoundColumn DataField="persGroup" HeaderText="persGroup" SortExpression="persGroup" UniqueName="persGroup" FilterControlWidth="50px">
                     <ColumnValidationSettings>
                         <ModelErrorMessage Text="" />
                     </ColumnValidationSettings>
                 </telerik:GridBoundColumn>
-                <telerik:GridBoundColumn DataField="unitinitials" FilterControlAltText="Filter unitinitials column" HeaderText="unitinitials" SortExpression="unitinitials" UniqueName="unitinitials" FilterControlWidth="50px">
+                <telerik:GridBoundColumn DataField="unitinitials" HeaderText="unitinitials" SortExpression="unitinitials" UniqueName="unitinitials" FilterControlWidth="50px">
                     <ColumnValidationSettings>
                         <ModelErrorMessage Text="" />
                     </ColumnValidationSettings>
                 </telerik:GridBoundColumn>
-                <telerik:GridBoundColumn DataField="name" FilterControlAltText="Filter name column" HeaderText="name" ReadOnly="True" SortExpression="name" UniqueName="name" FilterControlWidth="150px">
+                <telerik:GridBoundColumn DataField="name" HeaderText="name" ReadOnly="True" SortExpression="name" UniqueName="name" FilterControlWidth="150px">
                     <ColumnValidationSettings>
                         <ModelErrorMessage Text="" />
                     </ColumnValidationSettings>
                 </telerik:GridBoundColumn>
-                <telerik:GridBoundColumn DataField="rwp" FilterControlAltText="Filter rwp column" HeaderText="rwp" ReadOnly="True" SortExpression="rwp" UniqueName="rwp" FilterControlWidth="60px">
+                <telerik:GridBoundColumn DataField="rwp" HeaderText="rwp" ReadOnly="True" SortExpression="rwp" UniqueName="rwp" FilterControlWidth="60px">
                     <ColumnValidationSettings>
                         <ModelErrorMessage Text="" />
                     </ColumnValidationSettings>
                 </telerik:GridBoundColumn>
-                <telerik:GridBoundColumn DataField="description" FilterControlAltText="Filter description column" HeaderText="description" SortExpression="description" UniqueName="description" FilterControlWidth="150px">
+                <telerik:GridBoundColumn DataField="description" HeaderText="description" SortExpression="description" UniqueName="description" FilterControlWidth="150px">
                     <ColumnValidationSettings>
                         <ModelErrorMessage Text="" />
                     </ColumnValidationSettings>
                 </telerik:GridBoundColumn>
-                <telerik:GridBoundColumn DataField="hptotal" DataType="System.Decimal" FilterControlAltText="Filter hptotal column" HeaderText="hptotal" ReadOnly="True" SortExpression="hptotal" UniqueName="hptotal" FilterControlWidth="60px">
+                <telerik:GridBoundColumn DataField="hptotal" DataType="System.Decimal" HeaderText="hptotal" ReadOnly="True" SortExpression="hptotal" UniqueName="hptotal" FilterControlWidth="60px">
                     <ColumnValidationSettings>
                         <ModelErrorMessage Text="" />
                     </ColumnValidationSettings>
                 </telerik:GridBoundColumn>
-                <telerik:GridBoundColumn DataField="totalhours" DataType="System.Decimal" FilterControlAltText="Filter totalhours column" HeaderText="totalhours" ReadOnly="True" SortExpression="totalhours" UniqueName="totalhours" FilterControlWidth="60px">
+                <telerik:GridBoundColumn DataField="totalhours" DataType="System.Decimal" HeaderText="totalhours" ReadOnly="True" SortExpression="totalhours" UniqueName="totalhours" FilterControlWidth="60px">
                     <ColumnValidationSettings>
                         <ModelErrorMessage Text="" />
                     </ColumnValidationSettings>
                 </telerik:GridBoundColumn>
-                <telerik:GridBoundColumn DataField="visits" DataType="System.Int32" FilterControlAltText="Filter visits column" HeaderText="visits" ReadOnly="True" SortExpression="visits" UniqueName="visits" FilterControlWidth="50px">
+                <telerik:GridBoundColumn DataField="visits" DataType="System.Int32" HeaderText="visits" ReadOnly="True" SortExpression="visits" UniqueName="visits" FilterControlWidth="50px">
                     <ColumnValidationSettings>
                         <ModelErrorMessage Text="" />
                     </ColumnValidationSettings>
                 </telerik:GridBoundColumn>
-                <telerik:GridBoundColumn DataField="VisitFirst" DataType="System.DateTime" FilterControlAltText="Filter VisitFirst column" HeaderText="VisitFirst" ReadOnly="True" SortExpression="VisitFirst" UniqueName="VisitFirst" FilterControlWidth="80px">
+                <telerik:GridBoundColumn DataField="VisitFirst" DataType="System.DateTime" HeaderText="VisitFirst" ReadOnly="True" SortExpression="VisitFirst" UniqueName="VisitFirst" FilterControlWidth="80px">
                     <ColumnValidationSettings>
                         <ModelErrorMessage Text="" />
                     </ColumnValidationSettings>
                 </telerik:GridBoundColumn>
-                <telerik:GridBoundColumn DataField="Visitlast" DataType="System.DateTime" FilterControlAltText="Filter Visitlast column" HeaderText="Visitlast" ReadOnly="True" SortExpression="Visitlast" UniqueName="Visitlast" FilterControlWidth="80px">
+                <telerik:GridBoundColumn DataField="Visitlast" DataType="System.DateTime" HeaderText="Visitlast" ReadOnly="True" SortExpression="Visitlast" UniqueName="Visitlast" FilterControlWidth="80px">
                     <ColumnValidationSettings>
                         <ModelErrorMessage Text="" />
                     </ColumnValidationSettings>
diff --git a/eDos/Rems/RemsUnitTaskPersonVisits.aspx b/eDos/Rems/RemsUnitTaskPersonVisits.aspx
index da42a41..5054185 100644
--- a/eDos/Rems/RemsUnitTaskPersonVisits.aspx
+++ b/eDos/Rems/RemsUnitTaskPersonVisits.aspx
@@ -23,57 +23,57 @@
         <MasterTableView DataSourceID="SqlDSRems" CommandItemDisplay="Top" AutoGenerateColumns="False">
             <CommandItemSettings ShowAddNewRecordButton="False" ShowExportToExcelButton="True" ShowExportToWordButton="True" />
             <Columns>
-                <telerik:GridBoundColumn DataField="hpid" FilterControlAltText="Filter hpid column" HeaderText="hpid" SortExpression="hpid" UniqueName="hpid" FilterControlWidth="50px">
+                <telerik:GridBoundColumn DataField="hpid" HeaderText="hpid" SortExpression="hpid" UniqueName="hpid" FilterControlWidth="50px">
                     <ColumnValidationSettings>
                         <ModelErrorMessage Text="" />
                     </ColumnValidationSettings>
                 </telerik:GridBoundColumn>
-                <telerik:GridBoundColumn DataField="persGroup" FilterControlAltText="Filter persGroup column" HeaderText="persGroup" SortExpression="persGroup" UniqueName="persGroup" FilterControlWidth="50px">
+                <telerik:GridBoundColumn DataField="persGroup" HeaderText="persGroup" SortExpression="persGroup" UniqueName="persGroup" FilterControlWidth="50px">
                     <ColumnValidationSettings>
                         <ModelErrorMessage Text="" />
                     </ColumnValidationSettings>
                 </telerik:GridBoundColumn>
-                <telerik:GridBoundColumn DataField="unitinitials" FilterControlAltText="Filter unitinitials column" HeaderText="unitinitials" SortExpression="unitinitials" UniqueName="unitinitials" FilterControlWidth="50px">
+                <telerik:GridBoundColumn DataField="unitinitials" HeaderText="unitinitials" SortExpression="unitinitials" UniqueName="unitinitials" FilterControlWidth="50px">
                     <ColumnValidationSettings>
                         <ModelErrorMessage Text="" />
                     </ColumnValidationSettings>
                 </telerik:GridBoundColumn>
-                <telerik:GridBoundColumn DataField="name" FilterControlAltText="Filter name column" HeaderText="name" ReadOnly="True" SortExpression="name" UniqueName="name" FilterControlWidth="175px">
+                <telerik:GridBoundColumn DataField="name" HeaderText="name" ReadOnly="True" SortExpression="name" UniqueName="name" FilterControlWidth="175px">
                     <ColumnValidationSettings>
                         <ModelErrorMessage Text="" />
                     </ColumnValidationSettings>
                 </telerik:GridBoundColumn>
-                <telerik:GridBoundColumn DataField="rwp" FilterControlAltText="Filter rwp column" HeaderText="rwp" ReadOnly="True" SortExpression="rwp" UniqueName="rwp" FilterControlWidth="50px">
+                <telerik:GridBoundColumn DataField="rwp" HeaderText="rwp" ReadOnly="True" SortExpression="rwp" UniqueName="rwp" FilterControlWidth="50px">
                     <ColumnValidationSettings>
                         <ModelErrorMessage Text="" />
                     </ColumnValidationSettings>
                 </telerik:GridBoundColumn>
-                <telerik:GridBoundColumn DataField="description" FilterControlAltText="Filter description column" HeaderText="description" SortExpression="description" UniqueName="description" FilterControlWidth="150px">
+                <telerik:GridBoundColumn DataField="description" HeaderText="description" SortExpression="description" UniqueName="description" FilterControlWidth="150px">
                     <ColumnValidationSettings>
                         <ModelErrorMessage Text="" />
                     </ColumnValidationSettings>
                 </telerik:GridBoundColumn>
-                <telerik:GridBoundColumn DataField="entry_date_time" DataType="System.DateTime" FilterControlAltText="Filter entry_date_time column" HeaderText="entry_date_time" SortExpression="entry_date_time" UniqueName="entry_date_time" FilterControlWidth="100px" DataFormatString="{0:yyyy-MM-dd HH:mm}">
+                <telerik:GridBoundColumn DataField="entry_date_time" DataType="System.DateTime" HeaderText="entry_date_time" SortExpression="entry_date_time" UniqueName="entry_date_time" FilterControlWidth="100px" DataFormatString="{0:yyyy-MM-dd HH:mm}">
                     <ColumnValidationSettings>
                         <ModelErrorMessage Text="" />
                     </ColumnValidationSettings>
                 </telerik:GridBoundColumn>
-                <telerik:GridBoundColumn DataField="exit_date_time" DataType="System.DateTime" FilterControlAltText="Filter exit_date_time column" HeaderText="exit_date_time" SortExpression="exit_date_time" UniqueName="exit_date_time" FilterControlWidth="100px" DataFormatString="{0:yyyy-MM-dd HH:mm}">
+                <telerik:GridBoundColumn DataField="exit_date_time" DataType="System.DateTime" HeaderText="exit_date_time" SortExpression="exit_date_time" UniqueName="exit_date_time" FilterControlWidth="100px" DataFormatString="{0:yyyy-MM-dd HH:mm}">
                     <ColumnValidationSettings>
                         <ModelErrorMessage Text="" />
                     </ColumnValidationSettings>
                 </telerik:GridBoundColumn>
-                <telerik:GridBoundColumn DataField="hp_on_exit" DataType="System.Decimal" FilterControlAltText="Filter hp_on_exit column" HeaderText="hp_on_exit" SortExpression="hp_on_exit" UniqueName="hp_on_exit" FilterControlWidth="50px">
+                <telerik:GridBoundColumn DataField="hp_on_exit" DataType="System.Decimal" HeaderText="hp_on_exit" SortExpression="hp_on_exit" UniqueName="hp_on_exit" FilterControlWidth="50px">
                     <ColumnValidationSettings>
                         <ModelErrorMessage Text="" />
                     </ColumnValidationSettings>
                 </telerik:GridBoundColumn>
-                <telerik:GridBoundColumn DataField="hours" DataType="System.Decimal" FilterControlAltText="Filter hours column" HeaderText="hours" ReadOnly="True" SortExpression="hours" UniqueName="hours" FilterControlWidth="50px" >
+                <telerik:GridBoundColumn DataField="hours" DataType="System.Decimal" HeaderText="hours" ReadOnly="True" SortExpression="hours" UniqueName="hours" FilterControlWidth="50px" >
                     <ColumnValidationSettings>
                         <ModelErrorMessage Text="" />
                     </ColumnValidationSettings>
                 </telerik:GridBoundColumn>
-                <telerik:GridBoundColumn DataField="hourstext" FilterControlAltText="Filter hourstext column" HeaderText="hourstext" ReadOnly="True" SortExpression="hourstext" UniqueName="hourstext" FilterControlWidth="50px">
+                <telerik:GridBoundColumn DataField="hourstext" HeaderText="hourstext" ReadOnly="True" SortExpression="hourstext" UniqueName="hourstext" FilterControlWidth="50px">
                     <ColumnValidationSettings>
                         <ModelErrorMessage Text="" />
                     </ColumnValidationSettings>
diff --git a/eDos/Reports/RemsByTaskPeriod.aspx b/eDos/Reports/RemsByTaskPeriod.aspx
index 7ba0954..2af21f7 100644
--- a/eDos/Reports/RemsByTaskPeriod.aspx
+++ b/eDos/Reports/RemsByTaskPeriod.aspx
@@ -22,38 +22,22 @@
                                 <telerik:GridRelationFields DetailKeyField="PersID" MasterKeyField="PersID" />
                             </ParentTableRelation>
                             <Columns>
-                                <telerik:GridBoundColumn DataField="TaskType_CODE" DataType="System.Int32" HeaderText="TaskType_CODE" SortExpression="TaskType_CODE" UniqueName="TaskType_CODE">
-                                </telerik:GridBoundColumn>
-                                <telerik:GridBoundColumn DataField="EPD" HeaderText="EPD" ReadOnly="True" SortExpression="EPD" UniqueName="EPD">
-                                </telerik:GridBoundColumn>
-                                <telerik:GridBoundColumn DataField="Task_Name" HeaderText="Task_Name" SortExpression="Task_Name" UniqueName="Task_Name">
-                                </telerik:GridBoundColumn>
-                                <telerik:GridBoundColumn DataField="HP10G" DataType="System.Double" HeaderText="HP10G" ReadOnly="True" SortExpression="HP10G" UniqueName="HP10G" DataFormatString="{0:0.00}">
-                                </telerik:GridBoundColumn>
-                                <telerik:GridBoundColumn DataField="HP10N" DataType="System.Double" HeaderText="HP10N" ReadOnly="True" SortExpression="HP10N" UniqueName="HP10N" DataFormatString="{0:0.00}">
-                                </telerik:GridBoundColumn>
-                                <telerik:GridBoundColumn DataField="HP10GN" DataType="System.Double" HeaderText="HP10GN" ReadOnly="True" SortExpression="HP10GN" UniqueName="HP10GN" DataFormatString="{0:0.00}">
-                                </telerik:GridBoundColumn>
-                                <telerik:GridBoundColumn DataField="HS07" DataType="System.Double" HeaderText="HS07" ReadOnly="True" SortExpression="HS07" UniqueName="HS07" DataFormatString="{0:0.00}">
-                                </telerik:GridBoundColumn>
-                                <telerik:GridBoundColumn DataField="peopleOnTask" DataType="System.Int32" HeaderText="peopleOnTask" ReadOnly="True" SortExpression="peopleOnTask" UniqueName="peopleOnTask">
-                                </telerik:GridBoundColumn>
-                                <telerik:GridBoundColumn DataField="visits" DataType="System.Int32" HeaderText="visits" ReadOnly="True" SortExpression="visits" UniqueName="visits">
-                                </telerik:GridBoundColumn>
-                                <telerik:GridBoundColumn DataField="hours" DataType="System.Int32" HeaderText="hours" ReadOnly="True" SortExpression="hours" UniqueName="hours">
-                                </telerik:GridBoundColumn>
-                                <telerik:GridBoundColumn DataField="maxHoursVisits" DataType="System.Int32" HeaderText="maxHoursVisits" ReadOnly="True" SortExpression="maxHoursVisits" UniqueName="maxHoursVisits">
-                                </telerik:GridBoundColumn>
-                                <telerik:GridBoundColumn DataField="HoursLimited" DataType="System.Int32" HeaderText="HoursLimited" ReadOnly="True" SortExpression="HoursLimited" UniqueName="HoursLimited">
-                                </telerik:GridBoundColumn>
-                                <telerik:GridBoundColumn DataField="HoursLimited8" DataType="System.Int32" HeaderText="HoursLimited8" ReadOnly="True" SortExpression="HoursLimited8" UniqueName="HoursLimited8">
-                                </telerik:GridBoundColumn>
-                                <telerik:GridBoundColumn DataField="AvgHpInd" DataType="System.Double" HeaderText="AvgHpInd" ReadOnly="True" SortExpression="AvgHpInd" UniqueName="AvgHpInd">
-                                </telerik:GridBoundColumn>
-                                <telerik:GridBoundColumn DataField="MaxHpInd" DataType="System.Double" HeaderText="MaxHpInd" ReadOnly="True" SortExpression="MaxHpInd" UniqueName="MaxHpInd">
-                                </telerik:GridBoundColumn>
-                                <telerik:GridBoundColumn DataField="ID_Task" DataType="System.Int32" HeaderText="ID_Task" ReadOnly="True" SortExpression="ID_Task" UniqueName="ID_Task">
-                                </telerik:GridBoundColumn>
+                                <telerik:GridBoundColumn DataField="TaskType_CODE" DataType="System.Int32" HeaderText="TaskType_CODE" SortExpression="TaskType_CODE" UniqueName="TaskType_CODE" />
+                                <telerik:GridBoundColumn DataField="EPD" HeaderText="EPD" ReadOnly="True" SortExpression="EPD" UniqueName="EPD" />
+                                <telerik:GridBoundColumn DataField="Task_Name" HeaderText="Task_Name" SortExpression="Task_Name" UniqueName="Task_Name" />
+                                <telerik:GridBoundColumn DataField="HP10G" DataType="System.Double" HeaderText="HP10G" ReadOnly="True" SortExpression="HP10G" UniqueName="HP10G" DataFormatString="{0:0.00}" />
+                                <telerik:GridBoundColumn DataField="HP10N" DataType="System.Double" HeaderText="HP10N" ReadOnly="True" SortExpression="HP10N" UniqueName="HP10N" DataFormatString="{0:0.00}" />
+                                <telerik:GridBoundColumn DataField="HP10GN" DataType="System.Double" HeaderText="HP10GN" ReadOnly="True" SortExpression="HP10GN" UniqueName="HP10GN" DataFormatString="{0:0.00}" />
+                                <telerik:GridBoundColumn DataField="HS07" DataType="System.Double" HeaderText="HS07" ReadOnly="True" SortExpression="HS07" UniqueName="HS07" DataFormatString="{0:0.00}" />
+                                <telerik:GridBoundColumn DataField="peopleOnTask" DataType="System.Int32" HeaderText="peopleOnTask" ReadOnly="True" SortExpression="peopleOnTask" UniqueName="peopleOnTask" />
+                                <telerik:GridBoundColumn DataField="visits" DataType="System.Int32" HeaderText="visits" ReadOnly="True" SortExpression="visits" UniqueName="visits" />
+                                <telerik:GridBoundColumn DataField="hours" DataType="System.Int32" HeaderText="hours" ReadOnly="True" SortExpression="hours" UniqueName="hours" />
+                                <telerik:GridBoundColumn DataField="maxHoursVisits" DataType="System.Int32" HeaderText="maxHoursVisits" ReadOnly="True" SortExpression="maxHoursVisits" UniqueName="maxHoursVisits" />
+                                <telerik:GridBoundColumn DataField="HoursLimited" DataType="System.Int32" HeaderText="HoursLimited" ReadOnly="True" SortExpression="HoursLimited" UniqueName="HoursLimited" />
+                                <telerik:GridBoundColumn DataField="HoursLimited8" DataType="System.Int32" HeaderText="HoursLimited8" ReadOnly="True" SortExpression="HoursLimited8" UniqueName="HoursLimited8" />
+                                <telerik:GridBoundColumn DataField="AvgHpInd" DataType="System.Double" HeaderText="AvgHpInd" ReadOnly="True" SortExpression="AvgHpInd" UniqueName="AvgHpInd" />
+                                <telerik:GridBoundColumn DataField="MaxHpInd" DataType="System.Double" HeaderText="MaxHpInd" ReadOnly="True" SortExpression="MaxHpInd" UniqueName="MaxHpInd" />
+                                <telerik:GridBoundColumn DataField="ID_Task" DataType="System.Int32" HeaderText="ID_Task" ReadOnly="True" SortExpression="ID_Task" UniqueName="ID_Task" />
                             </Columns>
                         </telerik:GridTableView>
                     </DetailTables>
@@ -62,72 +46,41 @@
                     </ParentTableRelation>
                     <CommandItemSettings ShowAddNewRecordButton="False" />
                     <Columns>
-                        <telerik:GridBoundColumn DataField="task" HeaderText="task" ReadOnly="True" SortExpression="task" UniqueName="task">
-                        </telerik:GridBoundColumn>
-                        <telerik:GridBoundColumn DataField="PersID" DataType="System.Int32" HeaderText="PersID" SortExpression="PersID" UniqueName="PersID">
-                        </telerik:GridBoundColumn>
-                        <telerik:GridBoundColumn DataField="name" HeaderText="name" ReadOnly="True" SortExpression="name" UniqueName="name">
-                        </telerik:GridBoundColumn>
-                        <telerik:GridBoundColumn DataField="firstEntry" DataType="System.DateTime" HeaderText="firstEntry" ReadOnly="True" SortExpression="firstEntry" UniqueName="firstEntry">
-                        </telerik:GridBoundColumn>
-                        <telerik:GridBoundColumn DataField="lastExit" DataType="System.DateTime" HeaderText="lastExit" ReadOnly="True" SortExpression="lastExit" UniqueName="lastExit">
-                        </telerik:GridBoundColumn>
-                        <telerik:GridBoundColumn DataField="hours" DataType="System.Decimal" HeaderText="hours" ReadOnly="True" SortExpression="hours" UniqueName="hours">
-                        </telerik:GridBoundColumn>
-                        <telerik:GridBoundColumn DataField="HP10G" DataType="System.Double" HeaderText="HP10G" ReadOnly="True" SortExpression="HP10G" UniqueName="HP10G" DataFormatString="{0:0.00}">
-                        </telerik:GridBoundColumn>
-                        <telerik:GridBoundColumn DataField="HP10N" DataType="System.Double" HeaderText="HP10N" ReadOnly="True" SortExpression="HP10N" UniqueName="HP10N" DataFormatString="{0:0.00}">
-                        </telerik:GridBoundColumn>
-                        <telerik:GridBoundColumn DataField="HP10GN" DataType="System.Double" HeaderText="HP10GN" ReadOnly="True" SortExpression="HP10GN" UniqueName="HP10GN" DataFormatString="{0:0.00}">
-                        </telerik:GridBoundColumn>
-                        <telerik:GridBoundColumn DataField="HS07" DataType="System.Double" HeaderText="HS07" ReadOnly="True" SortExpression="HS07" UniqueName="HS07" DataFormatString="{0:0.00}">
-                        </telerik:GridBoundColumn>
-                        <telerik:GridBoundColumn DataField="visits" DataType="System.Int32" HeaderText="visits" ReadOnly="True" SortExpression="visits" UniqueName="visits">
-                        </telerik:GridBoundColumn>
-                        <telerik:GridBoundColumn DataField="persId1" DataType="System.Int32" HeaderText="persId1" SortExpression="persId1" UniqueName="persId1">
-                        </telerik:GridBoundColumn>
+                        <telerik:GridBoundColumn DataField="task" HeaderText="task" ReadOnly="True" SortExpression="task" UniqueName="task" />
+                        <telerik:GridBoundColumn DataField="PersID" DataType="System.Int32" HeaderText="PersID" SortExpression="PersID" UniqueName="PersID" />
+                        <telerik:GridBoundColumn DataField="name" HeaderText="name" ReadOnly="True" SortExpression="name" UniqueName="name" />
+                        <telerik:GridBoundColumn DataField="firstEntry" DataType="System.DateTime" HeaderText="firstEntry" ReadOnly="True" SortExpression="firstEntry" UniqueName="firstEntry" />
+                        <telerik:GridBoundColumn DataField="lastExit" DataType="System.DateTime" HeaderText="lastExit" ReadOnly="True" SortExpression="lastExit" UniqueName="lastExit" />
+                        <telerik:GridBoundColumn DataField="hours" DataType="System.Decimal" HeaderText="hours" ReadOnly="True" SortExpression="hours" UniqueName="hours" />
+                        <telerik:GridBoundColumn DataField="HP10G" DataType="System.Double" HeaderText="HP10G" ReadOnly="True" SortExpression="HP10G" UniqueName="HP10G" DataFormatString="{0:0.00}" />
+                        <telerik:GridBoundColumn DataField="HP10N" DataType="System.Double" HeaderText="HP10N" ReadOnly="True" SortExpression="HP10N" UniqueName="HP10N" DataFormatString="{0:0.00}" />
+                        <telerik:GridBoundColumn DataField="HP10GN" DataType="System.Double" HeaderText="HP10GN" ReadOnly="True" SortExpression="HP10GN" UniqueName="HP10GN" DataFormatString="{0:0.00}" />
+                        <telerik:GridBoundColumn DataField="HS07" DataType="System.Double" HeaderText="HS07" ReadOnly="True" SortExpression="HS07" UniqueName="HS07" DataFormatString="{0:0.00}" />
+                        <telerik:GridBoundColumn DataField="visits" DataType="System.Int32" HeaderText="visits" ReadOnly="True" SortExpression="visits" UniqueName="visits" />
+                        <telerik:GridBoundColumn DataField="persId1" DataType="System.Int32" HeaderText="persId1" SortExpression="persId1" UniqueName="persId1" />
                     </Columns>
                 </telerik:GridTableView>
             </DetailTables>
 
             <Columns>
-               
-                <telerik:GridBoundColumn DataField="TaskType_CODE" DataType="System.Int32" HeaderText="TaskType_CODE" SortExpression="TaskType_CODE" UniqueName="TaskType_CODE">
-                </telerik:GridBoundColumn>
-                <telerik:GridBoundColumn DataField="EPD" HeaderText="EPD" ReadOnly="True" SortExpression="EPD" UniqueName="EPD">
-                </telerik:GridBoundColumn>
-                <telerik:GridBoundColumn DataField="Task_Name" HeaderText="Task_Name" SortExpression="Task_Name" UniqueName="Task_Name">
-                </telerik:GridBoundColumn>
-                <telerik:GridBoundColumn DataField="HP10G" DataType="System.Double" HeaderText="HP10G" ReadOnly="True" SortExpression="HP10G" UniqueName="HP10G" DataFormatString="{0:0.00}">
-                </telerik:GridBoundColumn>
-                <telerik:GridBoundColumn DataField="HP10N" DataType="System.Double" HeaderText="HP10N" ReadOnly="True" SortExpression="HP10N" UniqueName="HP10N" DataFormatString="{0:0.00}">
-                </telerik:GridBoundColumn>
-                <telerik:GridBoundColumn DataField="HP10GN" DataType="System.Double" HeaderText="HP10GN" ReadOnly="True" SortExpression="HP10GN" UniqueName="HP10GN" DataFormatString="{0:0.00}">
-                </telerik:GridBoundColumn>
-                <telerik:GridBoundColumn DataField="HS07" DataType="System.Double" HeaderText="HS07" ReadOnly="True" SortExpression="HS07" UniqueName="HS07" DataFormatString="{0:0.00}">
-                </telerik:GridBoundColumn>
-                <telerik:GridBoundColumn DataField="peopleOnTask" DataType="System.Int32" HeaderText="peopleOnTask" ReadOnly="True" SortExpression="peopleOnTask" UniqueName="peopleOnTask">
-                </telerik:GridBoundColumn>
-                <telerik:GridBoundColumn DataField="visits" DataType="System.Int32" HeaderText="visits" ReadOnly="True" SortExpression="visits" UniqueName="visits">
-                </telerik:GridBoundColumn>
-                <telerik:GridBoundColumn DataField="hours" DataType="System.Int32" HeaderText="hours" ReadOnly="True" SortExpression="hours" UniqueName="hours">
-                </telerik:GridBoundColumn>
-                <telerik:GridBoundColumn DataField="maxHoursVisits" DataType="System.Int32" HeaderText="maxHoursVisits" ReadOnly="True" SortExpression="maxHoursVisits" UniqueName="maxHoursVisits">
-                </telerik:GridBoundColumn>
-                <telerik:GridBoundColumn DataField="HoursLimited" DataType="System.Int32" HeaderText="HoursLimited" ReadOnly="True" SortExpression="HoursLimited" UniqueName="HoursLimited">
-                </telerik:GridBoundColumn>
-                <telerik:GridBoundColumn DataField="HoursLimited8" DataType="System.Int32" HeaderText="HoursLimited8" ReadOnly="True" SortExpression="HoursLimited8" UniqueName="HoursLimited8">
-                </telerik:GridBoundColumn>
-                <telerik:GridBoundColumn DataField="AvgHpInd" DataType="System.Double" HeaderText="Avg Hp Ind." ReadOnly="True" SortExpression="AvgHpInd" UniqueName="AvgHpInd"  DataFormatString="{0:0.00}">
-                </telerik:GridBoundColumn>
-                <telerik:GridBoundColumn DataField="MaxHpInd" DataType="System.Double" HeaderText="Max Hp Ind." ReadOnly="True" SortExpression="MaxHpInd" UniqueName="MaxHpInd"  DataFormatString="{0:0.00}">
-                </telerik:GridBoundColumn>
-                <telerik:GridBoundColumn DataField="ID_Task" DataType="System.Int32" HeaderText="ID_Task" ReadOnly="True" SortExpression="ID_Task" UniqueName="ID_Task">
-                </telerik:GridBoundColumn>
-                 <telerik:GridBoundColumn DataField="minDate" DataType="System.DateTime" HeaderText="minDate" ReadOnly="True" SortExpression="minDate" UniqueName="minDate">
-                </telerik:GridBoundColumn>
-                <telerik:GridBoundColumn DataField="maxDate" DataType="System.DateTime" HeaderText="maxDate" ReadOnly="True" SortExpression="maxDate" UniqueName="maxDate">
-                </telerik:GridBoundColumn>
+                <telerik:GridBoundColumn DataField="TaskType_CODE" DataType="System.Int32" HeaderText="TaskType_CODE" SortExpression="TaskType_CODE" UniqueName="TaskType_CODE" />
+                <telerik:GridBoundColumn DataField="EPD" HeaderText="EPD" ReadOnly="True" SortExpression="EPD" UniqueName="EPD" />
+                <telerik:GridBoundColumn DataField="Task_Name" HeaderText="Task_Name" SortExpression="Task_Name" UniqueName="Task_Name" />
+                <telerik:GridBoundColumn DataField="HP10G" DataType="System.Double" HeaderText="HP10G" ReadOnly="True" SortExpression="HP10G" UniqueName="HP10G" DataFormatString="{0:0.00}" />
+                <telerik:GridBoundColumn DataField="HP10N" DataType="System.Double" HeaderText="HP10N" ReadOnly="True" SortExpression="HP10N" UniqueName="HP10N" DataFormatString="{0:0.00}" />
+                <telerik:GridBoundColumn DataField="HP10GN" DataType="System.Double" HeaderText="HP10GN" ReadOnly="True" SortExpression="HP10GN" UniqueName="HP10GN" DataFormatString="{0:0.00}" />
+                <telerik:GridBoundColumn DataField="HS07" DataType="System.Double" HeaderText="HS07" ReadOnly="True" SortExpression="HS07" UniqueName="HS07" DataFormatString="{0:0.00}" />
+                <telerik:GridBoundColumn DataField="peopleOnTask" DataType="System.Int32" HeaderText="peopleOnTask" ReadOnly="True" SortExpression="peopleOnTask" UniqueName="peopleOnTask" />
+                <telerik:GridBoundColumn DataField="visits" DataType="System.Int32" HeaderText="visits" ReadOnly="True" SortExpression="visits" UniqueName="visits" />
+                <telerik:GridBoundColumn DataField="hours" DataType="System.Int32" HeaderText="hours" ReadOnly="True" SortExpression="hours" UniqueName="hours" />
+                <telerik:GridBoundColumn DataField="maxHoursVisits" DataType="System.Int32" HeaderText="maxHoursVisits" ReadOnly="True" SortExpression="maxHoursVisits" UniqueName="maxHoursVisits" />
+                <telerik:GridBoundColumn DataField="HoursLimited" DataType="System.Int32" HeaderText="HoursLimited" ReadOnly="True" SortExpression="HoursLimited" UniqueName="HoursLimited" />
+                <telerik:GridBoundColumn DataField="HoursLimited8" DataType="System.Int32" HeaderText="HoursLimited8" ReadOnly="True" SortExpression="HoursLimited8" UniqueName="HoursLimited8" />
+                <telerik:GridBoundColumn DataField="AvgHpInd" DataType="System.Double" HeaderText="Avg Hp Ind." ReadOnly="True" SortExpression="AvgHpInd" UniqueName="AvgHpInd"  DataFormatString="{0:0.00}" />
+                <telerik:GridBoundColumn DataField="MaxHpInd" DataType="System.Double" HeaderText="Max Hp Ind." ReadOnly="True" SortExpression="MaxHpInd" UniqueName="MaxHpInd"  DataFormatString="{0:0.00}" />
+                <telerik:GridBoundColumn DataField="ID_Task" DataType="System.Int32" HeaderText="ID_Task" ReadOnly="True" SortExpression="ID_Task" UniqueName="ID_Task" />
+                 <telerik:GridBoundColumn DataField="minDate" DataType="System.DateTime" HeaderText="minDate" ReadOnly="True" SortExpression="minDate" UniqueName="minDate" />
+                <telerik:GridBoundColumn DataField="maxDate" DataType="System.DateTime" HeaderText="maxDate" ReadOnly="True" SortExpression="maxDate" UniqueName="maxDate" />
             </Columns>
 
         </MasterTableView>
diff --git a/eDos/Site.master b/eDos/Site.master
index 120a873..cdb6fe8 100644
--- a/eDos/Site.master
+++ b/eDos/Site.master
@@ -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">eDos 2020</asp:Literal></span>
+                            <asp:Literal ID="Literal2" runat="server">eDos 2021</asp:Literal></span>
                     </h2>
                     <div style="width: 20%; float: right; background-color: inherit;">
                     </div>
diff --git a/eDos/TaskBG.aspx b/eDos/TaskBG.aspx
index 016eefd..856f3ea 100644
--- a/eDos/TaskBG.aspx
+++ b/eDos/TaskBG.aspx
@@ -31,7 +31,7 @@
                 </telerik:GridBoundColumn>
                 <telerik:GridBoundColumn DataField="InstallationName" HeaderText="Installation" UniqueName="InstallationName" SortExpression="InstallationName" FilterControlWidth="100px" HeaderStyle-Width="130px" CurrentFilterFunction="Contains" ShowFilterIcon="false" AutoPostBackOnFilter="true">
                 </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" ReadOnly="true">
+                <telerik:GridBoundColumn DataField="Inst_CODE" HeaderText="Code" UniqueName="Inst_CODE" DataType="System.Int32" SortExpression="Inst_CODE" HeaderStyle-Width="60px" ReadOnly="true">
                 </telerik:GridBoundColumn>
                 <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>
@@ -41,7 +41,7 @@
                 </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 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="TaskDateStart" HeaderText="Task Start" SortExpression="TaskDateStart" UniqueName="TaskDateStart" 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>
                 <telerik:GridCheckBoxColumn DataField="TaskEnable" DataType="System.Boolean" HeaderText="Enable" UniqueName="TaskEnable" SortExpression="TaskEnable" HeaderStyle-Width="100px">
diff --git a/eDos/TaskNG.aspx b/eDos/TaskNG.aspx
index 52189e4..7ed1786 100644
--- a/eDos/TaskNG.aspx
+++ b/eDos/TaskNG.aspx
@@ -24,7 +24,7 @@
                 </telerik:GridBoundColumn>
                 <telerik:GridBoundColumn DataField="InstallationName" HeaderText="Installation" UniqueName="InstallationName" SortExpression="InstallationName" FilterControlWidth="100px" HeaderStyle-Width="130px" CurrentFilterFunction="Contains" ShowFilterIcon="false" AutoPostBackOnFilter="true">
                 </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" ReadOnly="true">
+                <telerik:GridBoundColumn DataField="Inst_CODE" HeaderText="Code" UniqueName="Inst_CODE" DataType="System.Int32" SortExpression="Inst_CODE" HeaderStyle-Width="60px" ReadOnly="true">
                 </telerik:GridBoundColumn>
                 <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>
@@ -35,7 +35,7 @@
                 <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="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="TaskDateStart" HeaderText="Task Start" SortExpression="TaskDateStart" UniqueName="TaskDateStart" 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>
                 <telerik:GridCheckBoxColumn DataField="TaskEnable" DataType="System.Boolean" HeaderText="Enable" UniqueName="TaskEnable" SortExpression="TaskEnable" HeaderStyle-Width="100px">
diff --git a/eDos/TaskTypeStandard.aspx b/eDos/TaskTypeStandard.aspx
index 6dc1e43..c7676de 100644
--- a/eDos/TaskTypeStandard.aspx
+++ b/eDos/TaskTypeStandard.aspx
@@ -19,9 +19,9 @@
         <MasterTableView DataKeyNames="TaskTypeStandard_CODE" CommandItemDisplay="TopAndBottom" DataSourceID="sqlDSTaskTypeStandard" >
             <CommandItemSettings ShowExportToExcelButton="True" ShowAddNewRecordButton="False" />
             <Columns>
-                <telerik:GridBoundColumn DataField="TaskTypeStandard_CODE" FilterControlAltText="Filter TaskTypeStandard_CODE column" HeaderText="Task Standard Number" SortExpression="TaskTypeStandard_CODE" UniqueName="TaskTypeStandard_CODE" DataType="System.Int32" ReadOnly="True">
+                <telerik:GridBoundColumn DataField="TaskTypeStandard_CODE" HeaderText="Task Standard Number" SortExpression="TaskTypeStandard_CODE" UniqueName="TaskTypeStandard_CODE" DataType="System.Int32" ReadOnly="True">
                 </telerik:GridBoundColumn>
-                <telerik:GridBoundColumn DataField="TaskType_Name" FilterControlAltText="Filter TaskType_Name column" HeaderText="Task Standard Name" SortExpression="TaskType_Name" UniqueName="TaskType_Name">
+                <telerik:GridBoundColumn DataField="TaskType_Name" HeaderText="Task Standard Name" SortExpression="TaskType_Name" UniqueName="TaskType_Name">
                 </telerik:GridBoundColumn>
             </Columns>
         </MasterTableView>
diff --git a/eDos/WSumDose.aspx b/eDos/WSumDose.aspx
index caf8836..b7883f7 100644
--- a/eDos/WSumDose.aspx
+++ b/eDos/WSumDose.aspx
@@ -17,35 +17,35 @@
     <MasterTableView AutoGenerateColumns="False" CommandItemDisplay="Top" AllowAutomaticDeletes="False" DataSourceID="sqlDSWSumDose">
         <CommandItemSettings ShowExportToExcelButton="True" />
         <Columns>
-            <telerik:GridBoundColumn DataField="SUMHp10Dose_Y" FilterControlAltText="Filter SUMHp10Dose_Y column" HeaderText="SUMHp10Dose_Y" SortExpression="SUMHp10Dose_Y" UniqueName="SUMHp10Dose_Y" DataType="System.Double">
+            <telerik:GridBoundColumn DataField="SUMHp10Dose_Y" HeaderText="SUMHp10Dose_Y" SortExpression="SUMHp10Dose_Y" UniqueName="SUMHp10Dose_Y" DataType="System.Double">
             </telerik:GridBoundColumn>
-            <telerik:GridBoundColumn DataField="SUMHp07Dose_Y" FilterControlAltText="Filter SUMHp07Dose_Y column" HeaderText="SUMHp07Dose_Y" SortExpression="SUMHp07Dose_Y" UniqueName="SUMHp07Dose_Y" DataType="System.Double">
+            <telerik:GridBoundColumn DataField="SUMHp07Dose_Y" HeaderText="SUMHp07Dose_Y" SortExpression="SUMHp07Dose_Y" UniqueName="SUMHp07Dose_Y" DataType="System.Double">
             </telerik:GridBoundColumn>
-            <telerik:GridBoundColumn DataField="TOTSUM_Y" FilterControlAltText="Filter TOTSUM_Y column" HeaderText="TOTSUM_Y" SortExpression="TOTSUM_Y" UniqueName="TOTSUM_Y" DataType="System.Double" ReadOnly="True">
+            <telerik:GridBoundColumn DataField="TOTSUM_Y" HeaderText="TOTSUM_Y" SortExpression="TOTSUM_Y" UniqueName="TOTSUM_Y" DataType="System.Double" ReadOnly="True">
             </telerik:GridBoundColumn>
-            <telerik:GridBoundColumn DataField="YearToDateLimit" FilterControlAltText="Filter YearToDateLimit column" HeaderText="YearToDateLimit" SortExpression="YearToDateLimit" UniqueName="YearToDateLimit" DataType="System.Double">
+            <telerik:GridBoundColumn DataField="YearToDateLimit" HeaderText="YearToDateLimit" SortExpression="YearToDateLimit" UniqueName="YearToDateLimit" DataType="System.Double">
             </telerik:GridBoundColumn>
-            <telerik:GridBoundColumn DataField="SUMHp10Dose_Q" FilterControlAltText="Filter SUMHp10Dose_Q column" HeaderText="SUMHp10Dose_Q" SortExpression="SUMHp10Dose_Q" UniqueName="SUMHp10Dose_Q" DataType="System.Double">
+            <telerik:GridBoundColumn DataField="SUMHp10Dose_Q" HeaderText="SUMHp10Dose_Q" SortExpression="SUMHp10Dose_Q" UniqueName="SUMHp10Dose_Q" DataType="System.Double">
             </telerik:GridBoundColumn>
-            <telerik:GridBoundColumn DataField="SUMHp07Dose_Q" DataType="System.Double" FilterControlAltText="Filter SUMHp07Dose_Q column" HeaderText="SUMHp07Dose_Q" SortExpression="SUMHp07Dose_Q" UniqueName="SUMHp07Dose_Q">
+            <telerik:GridBoundColumn DataField="SUMHp07Dose_Q" DataType="System.Double" HeaderText="SUMHp07Dose_Q" SortExpression="SUMHp07Dose_Q" UniqueName="SUMHp07Dose_Q">
             </telerik:GridBoundColumn>
-            <telerik:GridBoundColumn DataField="TOTSUM_Q" DataType="System.Double" FilterControlAltText="Filter TOTSUM_Q column" HeaderText="TOTSUM_Q" ReadOnly="True" SortExpression="TOTSUM_Q" UniqueName="TOTSUM_Q">
+            <telerik:GridBoundColumn DataField="TOTSUM_Q" DataType="System.Double" HeaderText="TOTSUM_Q" ReadOnly="True" SortExpression="TOTSUM_Q" UniqueName="TOTSUM_Q">
             </telerik:GridBoundColumn>
-            <telerik:GridBoundColumn DataField="QuarterLimit" DataType="System.Double" FilterControlAltText="Filter QuarterLimit column" HeaderText="QuarterLimit" SortExpression="QuarterLimit" UniqueName="QuarterLimit">
+            <telerik:GridBoundColumn DataField="QuarterLimit" DataType="System.Double" HeaderText="QuarterLimit" SortExpression="QuarterLimit" UniqueName="QuarterLimit">
             </telerik:GridBoundColumn>
-            <telerik:GridBoundColumn DataField="SUMHp10Dose_M" DataType="System.Double" FilterControlAltText="Filter SUMHp10Dose_M column" HeaderText="SUMHp10Dose_M" SortExpression="SUMHp10Dose_M" UniqueName="SUMHp10Dose_M">
+            <telerik:GridBoundColumn DataField="SUMHp10Dose_M" DataType="System.Double" HeaderText="SUMHp10Dose_M" SortExpression="SUMHp10Dose_M" UniqueName="SUMHp10Dose_M">
             </telerik:GridBoundColumn>
-            <telerik:GridBoundColumn DataField="SUMHp07Dose_M" DataType="System.Double" FilterControlAltText="Filter SUMHp07Dose_M column" HeaderText="SUMHp07Dose_M" SortExpression="SUMHp07Dose_M" UniqueName="SUMHp07Dose_M">
+            <telerik:GridBoundColumn DataField="SUMHp07Dose_M" DataType="System.Double" HeaderText="SUMHp07Dose_M" SortExpression="SUMHp07Dose_M" UniqueName="SUMHp07Dose_M">
             </telerik:GridBoundColumn>
-            <telerik:GridBoundColumn DataField="TOTSUM_M" DataType="System.Double" FilterControlAltText="Filter TOTSUM_M column" HeaderText="TOTSUM_M" ReadOnly="True" SortExpression="TOTSUM_M" UniqueName="TOTSUM_M">
+            <telerik:GridBoundColumn DataField="TOTSUM_M" DataType="System.Double" HeaderText="TOTSUM_M" ReadOnly="True" SortExpression="TOTSUM_M" UniqueName="TOTSUM_M">
             </telerik:GridBoundColumn>
-            <telerik:GridBoundColumn DataField="MonthlyLimit" DataType="System.Double" FilterControlAltText="Filter MonthlyLimit column" HeaderText="MonthlyLimit" SortExpression="MonthlyLimit" UniqueName="MonthlyLimit">
+            <telerik:GridBoundColumn DataField="MonthlyLimit" DataType="System.Double" HeaderText="MonthlyLimit" SortExpression="MonthlyLimit" UniqueName="MonthlyLimit">
             </telerik:GridBoundColumn>
-            <telerik:GridBoundColumn DataField="Margin" DataType="System.Double" FilterControlAltText="Filter Margin column" HeaderText="Margin" ReadOnly="True" SortExpression="Margin" UniqueName="Margin">
+            <telerik:GridBoundColumn DataField="Margin" DataType="System.Double" HeaderText="Margin" ReadOnly="True" SortExpression="Margin" UniqueName="Margin">
             </telerik:GridBoundColumn>
-            <telerik:GridBoundColumn DataField="Type" FilterControlAltText="Filter Type column" HeaderText="Type" SortExpression="Type" UniqueName="Type">
+            <telerik:GridBoundColumn DataField="Type" HeaderText="Type" SortExpression="Type" UniqueName="Type">
             </telerik:GridBoundColumn>
-            <telerik:GridBoundColumn DataField="PersID" DataType="System.Int32" FilterControlAltText="Filter PersID column" HeaderText="PersID" SortExpression="PersID" UniqueName="PersID">
+            <telerik:GridBoundColumn DataField="PersID" DataType="System.Int32" HeaderText="PersID" SortExpression="PersID" UniqueName="PersID">
             </telerik:GridBoundColumn>
            
           
diff --git a/eDos/Worker.aspx b/eDos/Worker.aspx
index 11c8b93..e7ca651 100644
--- a/eDos/Worker.aspx
+++ b/eDos/Worker.aspx
@@ -297,43 +297,43 @@
                     <Columns>
                         <telerik:GridBoundColumn DataField="ID_Visit" DataType="System.Int32" HeaderText="ID_Visit" ReadOnly="True" SortExpression="ID_Visit" UniqueName="ID_Visit">
                         </telerik:GridBoundColumn>
-                        <telerik:GridBoundColumn DataField="EntryTime" DataType="System.DateTime" FilterControlAltText="Filter EntryTime column" HeaderText="EntryTime" SortExpression="EntryTime" UniqueName="EntryTime">
+                        <telerik:GridBoundColumn DataField="EntryTime" DataType="System.DateTime" HeaderText="EntryTime" SortExpression="EntryTime" UniqueName="EntryTime">
                         </telerik:GridBoundColumn>
-                        <telerik:GridBoundColumn DataField="ReturnTime" DataType="System.DateTime" FilterControlAltText="Filter ReturnTime column" HeaderText="ReturnTime" SortExpression="ReturnTime" UniqueName="ReturnTime">
+                        <telerik:GridBoundColumn DataField="ReturnTime" DataType="System.DateTime" HeaderText="ReturnTime" SortExpression="ReturnTime" UniqueName="ReturnTime">
                         </telerik:GridBoundColumn>
-                        <telerik:GridBoundColumn DataField="InstallationName" FilterControlAltText="Filter InstallationName column" HeaderText="InstallationName" SortExpression="InstallationName" UniqueName="InstallationName">
+                        <telerik:GridBoundColumn DataField="InstallationName" HeaderText="InstallationName" SortExpression="InstallationName" UniqueName="InstallationName">
                         </telerik:GridBoundColumn>
-                        <telerik:GridBoundColumn DataField="Inst_CODE" DataType="System.Int32" FilterControlAltText="Filter Inst_CODE column" HeaderText="Inst_CODE" SortExpression="Inst_CODE" UniqueName="Inst_CODE">
+                        <telerik:GridBoundColumn DataField="Inst_CODE" DataType="System.Int32" HeaderText="Inst_CODE" SortExpression="Inst_CODE" UniqueName="Inst_CODE">
                         </telerik:GridBoundColumn>
-                        <telerik:GridBoundColumn DataField="TaskType_CODE" DataType="System.Int32" FilterControlAltText="Filter TaskType_CODE column" HeaderText="TaskType_CODE" SortExpression="TaskType_CODE" UniqueName="TaskType_CODE">
+                        <telerik:GridBoundColumn DataField="TaskType_CODE" DataType="System.Int32" HeaderText="TaskType_CODE" SortExpression="TaskType_CODE" UniqueName="TaskType_CODE">
                         </telerik:GridBoundColumn>
-                        <telerik:GridBoundColumn DataField="Hp10Dose" DataType="System.Double" FilterControlAltText="Filter Hp10Dose column" HeaderText="Hp10Dose" SortExpression="Hp10Dose" UniqueName="Hp10Dose">
+                        <telerik:GridBoundColumn DataField="Hp10Dose" DataType="System.Double" HeaderText="Hp10Dose" SortExpression="Hp10Dose" UniqueName="Hp10Dose">
                         </telerik:GridBoundColumn>
-                        <telerik:GridBoundColumn DataField="Hp07Dose" DataType="System.Double" FilterControlAltText="Filter Hp07Dose column" HeaderText="Hp07Dose" SortExpression="Hp07Dose" UniqueName="Hp07Dose">
+                        <telerik:GridBoundColumn DataField="Hp07Dose" DataType="System.Double" HeaderText="Hp07Dose" SortExpression="Hp07Dose" UniqueName="Hp07Dose">
                         </telerik:GridBoundColumn>
-                        <telerik:GridBoundColumn DataField="Hp10Peak" DataType="System.Double" FilterControlAltText="Filter Hp10Peak column" HeaderText="Hp10Peak" SortExpression="Hp10Peak" UniqueName="Hp10Peak">
+                        <telerik:GridBoundColumn DataField="Hp10Peak" DataType="System.Double" HeaderText="Hp10Peak" SortExpression="Hp10Peak" UniqueName="Hp10Peak">
                         </telerik:GridBoundColumn>
-                        <telerik:GridBoundColumn DataField="Hp07Peak" DataType="System.Double" FilterControlAltText="Filter Hp07Peak column" HeaderText="Hp07Peak" SortExpression="Hp07Peak" UniqueName="Hp07Peak">
+                        <telerik:GridBoundColumn DataField="Hp07Peak" DataType="System.Double" HeaderText="Hp07Peak" SortExpression="Hp07Peak" UniqueName="Hp07Peak">
                         </telerik:GridBoundColumn>
-                        <telerik:GridBoundColumn DataField="Hp10Time" DataType="System.DateTime" FilterControlAltText="Filter Hp10Time column" HeaderText="Hp10Time" SortExpression="Hp10Time" UniqueName="Hp10Time">
+                        <telerik:GridBoundColumn DataField="Hp10Time" DataType="System.DateTime" HeaderText="Hp10Time" SortExpression="Hp10Time" UniqueName="Hp10Time">
                         </telerik:GridBoundColumn>
-                        <telerik:GridBoundColumn DataField="Hp07Time" DataType="System.DateTime" FilterControlAltText="Filter Hp07Time column" HeaderText="Hp07Time" SortExpression="Hp07Time" UniqueName="Hp07Time">
+                        <telerik:GridBoundColumn DataField="Hp07Time" DataType="System.DateTime" HeaderText="Hp07Time" SortExpression="Hp07Time" UniqueName="Hp07Time">
                         </telerik:GridBoundColumn>
-                        <telerik:GridBoundColumn DataField="EPD_sn" FilterControlAltText="Filter EPD_sn column" HeaderText="EPD_sn" SortExpression="EPD_sn" UniqueName="EPD_sn">
+                        <telerik:GridBoundColumn DataField="EPD_sn" HeaderText="EPD_sn" SortExpression="EPD_sn" UniqueName="EPD_sn">
                         </telerik:GridBoundColumn>
-                        <telerik:GridBoundColumn DataField="EPDRad" FilterControlAltText="Filter EPDRad column" HeaderText="EPDRad" SortExpression="EPDRad" UniqueName="EPDRad">
+                        <telerik:GridBoundColumn DataField="EPDRad" HeaderText="EPDRad" SortExpression="EPDRad" UniqueName="EPDRad">
                         </telerik:GridBoundColumn>
-                        <telerik:GridBoundColumn DataField="alarmStatus" DataType="System.Int32" FilterControlAltText="Filter alarmStatus column" HeaderText="alarmStatus" SortExpression="alarmStatus" UniqueName="alarmStatus">
+                        <telerik:GridBoundColumn DataField="alarmStatus" DataType="System.Int32" HeaderText="alarmStatus" SortExpression="alarmStatus" UniqueName="alarmStatus">
                         </telerik:GridBoundColumn>
-                        <telerik:GridBoundColumn DataField="otherAlarms" DataType="System.Int32" FilterControlAltText="Filter otherAlarms column" HeaderText="otherAlarms" SortExpression="otherAlarms" UniqueName="otherAlarms">
+                        <telerik:GridBoundColumn DataField="otherAlarms" DataType="System.Int32" HeaderText="otherAlarms" SortExpression="otherAlarms" UniqueName="otherAlarms">
                         </telerik:GridBoundColumn>
-                        <telerik:GridBoundColumn DataField="errorStatus" DataType="System.Int32" FilterControlAltText="Filter errorStatus column" HeaderText="errorStatus" SortExpression="errorStatus" UniqueName="errorStatus">
+                        <telerik:GridBoundColumn DataField="errorStatus" DataType="System.Int32" HeaderText="errorStatus" SortExpression="errorStatus" UniqueName="errorStatus">
                         </telerik:GridBoundColumn>
-                        <telerik:GridBoundColumn DataField="operatingStatus" DataType="System.Int32" FilterControlAltText="Filter operatingStatus column" HeaderText="operatingStatus" SortExpression="operatingStatus" UniqueName="operatingStatus">
+                        <telerik:GridBoundColumn DataField="operatingStatus" DataType="System.Int32" HeaderText="operatingStatus" SortExpression="operatingStatus" UniqueName="operatingStatus">
                         </telerik:GridBoundColumn>
-                        <telerik:GridCheckBoxColumn DataField="isAlarmCleared" DataType="System.Boolean" FilterControlAltText="Filter isAlarmCleared column" HeaderText="isAlarmCleared" SortExpression="isAlarmCleared" UniqueName="isAlarmCleared">
+                        <telerik:GridCheckBoxColumn DataField="isAlarmCleared" DataType="System.Boolean" HeaderText="isAlarmCleared" SortExpression="isAlarmCleared" UniqueName="isAlarmCleared">
                         </telerik:GridCheckBoxColumn>
-                        <telerik:GridCheckBoxColumn DataField="isComplete" DataType="System.Boolean" FilterControlAltText="Filter isComplete column" HeaderText="isComplete" SortExpression="isComplete" UniqueName="isComplete">
+                        <telerik:GridCheckBoxColumn DataField="isComplete" DataType="System.Boolean" HeaderText="isComplete" SortExpression="isComplete" UniqueName="isComplete">
                         </telerik:GridCheckBoxColumn>
                     </Columns>
                 </MasterTableView>
diff --git a/eDos/eDos.csproj b/eDos/eDos.csproj
index 9632c07..b818d32 100644
--- a/eDos/eDos.csproj
+++ b/eDos/eDos.csproj
@@ -9,9 +9,9 @@
     <ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Rems2018</RootNamespace>
-    <AssemblyName>Rems2018</AssemblyName>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <RootNamespace>eDos2021</RootNamespace>
+    <AssemblyName>eDos2021</AssemblyName>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <OldToolsVersion>3.5</OldToolsVersion>
@@ -60,17 +60,20 @@
     <Reference Include="System.EnterpriseServices" />
     <Reference Include="System.Web.Mobile" />
     <Reference Include="System.Xml.Linq" />
-    <Reference Include="Telerik.Web.Design, Version=2020.2.617.45, Culture=neutral, PublicKeyToken=121fae78165ba3d4, processorArchitecture=MSIL">
-      <HintPath>..\packages\Telerik.UI.for.AspNet.Ajax.Net45.2020.2.617\lib\net45\Telerik.Web.Design.dll</HintPath>
+    <Reference Include="Telerik.Web.Design, Version=2021.2.616.45, Culture=neutral, PublicKeyToken=121fae78165ba3d4, processorArchitecture=MSIL">
+      <HintPath>..\packages\Telerik.UI.for.AspNet.Ajax.Net45.2021.2.616\lib\net45\Telerik.Web.Design.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="Telerik.Web.Device.Detection, Version=2020.2.617.45, Culture=neutral, PublicKeyToken=121fae78165ba3d4, processorArchitecture=MSIL">
-      <HintPath>..\packages\Telerik.UI.for.AspNet.Ajax.Net45.2020.2.617\lib\net45\Telerik.Web.Device.Detection.dll</HintPath>
+    <Reference Include="Telerik.Web.Device.Detection, Version=2021.2.616.45, Culture=neutral, PublicKeyToken=121fae78165ba3d4, processorArchitecture=MSIL">
+      <HintPath>..\packages\Telerik.UI.for.AspNet.Ajax.Net45.2021.2.616\lib\net45\Telerik.Web.Device.Detection.dll</HintPath>
     </Reference>
-    <Reference Include="Telerik.Web.UI, Version=2020.2.617.45, Culture=neutral, PublicKeyToken=121fae78165ba3d4, processorArchitecture=MSIL">
-      <HintPath>..\packages\Telerik.UI.for.AspNet.Ajax.Net45.2020.2.617\lib\net45\Telerik.Web.UI.dll</HintPath>
+    <Reference Include="Telerik.Web.UI, Version=2021.2.616.45, Culture=neutral, PublicKeyToken=121fae78165ba3d4, processorArchitecture=MSIL">
+      <HintPath>..\packages\Telerik.UI.for.AspNet.Ajax.Net45.2021.2.616\lib\net45\Telerik.Web.UI.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="Telerik.Web.UI.Skins, Version=2020.2.617.45, Culture=neutral, PublicKeyToken=121fae78165ba3d4, processorArchitecture=MSIL">
-      <HintPath>..\packages\Telerik.UI.for.AspNet.Ajax.Net45.2020.2.617\lib\net45\Telerik.Web.UI.Skins.dll</HintPath>
+    <Reference Include="Telerik.Web.UI.Skins, Version=2021.2.616.45, Culture=neutral, PublicKeyToken=121fae78165ba3d4, processorArchitecture=MSIL">
+      <HintPath>..\packages\Telerik.UI.for.AspNet.Ajax.Net45.2021.2.616\lib\net45\Telerik.Web.UI.Skins.dll</HintPath>
+      <Private>True</Private>
     </Reference>
   </ItemGroup>
   <ItemGroup>
diff --git a/eDos/eDos.csproj.user b/eDos/eDos.csproj.user
index a7089cd..451ea80 100644
--- a/eDos/eDos.csproj.user
+++ b/eDos/eDos.csproj.user
@@ -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>Debug|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
     <UseIISExpress>true</UseIISExpress>
     <Use64BitIISExpress />
     <IISExpressSSLPort />
@@ -9,13 +9,13 @@
     <IISExpressWindowsAuthentication />
     <IISExpressUseClassicPipelineMode />
     <UseGlobalApplicationHostFile />
-    <NameOfLastUsedPublishProfile>eDosTest</NameOfLastUsedPublishProfile>
+    <NameOfLastUsedPublishProfile>D:\l\src\asp2019\eDosWeb\eDos\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
   </PropertyGroup>
   <ProjectExtensions>
     <VisualStudio>
       <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
         <WebProjectProperties>
-          <StartPageUrl>Reports/RemsByTaskPeriod.aspx</StartPageUrl>
+          <StartPageUrl>Rems/BR2 Cycli Doses per Person per Task.aspx</StartPageUrl>
           <StartAction>SpecificPage</StartAction>
           <AspNetDebugging>True</AspNetDebugging>
           <SilverlightDebugging>False</SilverlightDebugging>
diff --git a/eDos/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/eDos/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 69cf2fc49cb69f084314583a260c1d59c73f38b8..5627dbb519332af6ee420f30609723b0b6be43ae 100644
GIT binary patch
delta 77
zcmbQ>Kf!;36QkMWKo-r7Ip3t&4fTxl%nZ#Y-<6S^+$0l%#4kr;i%%|+4MOH`ek8k&
F69A?87vlf`

delta 77
zcmbQ>Kf!;36Qk+mKo-r7Ip3t&4fKrk%nZ#Z-<6S^+$0l%#4kr;i%%|+4MOH`ek8k&
F69A=~7vcZ_

diff --git a/eDos/obj/Debug/eDos.csproj.CoreCompileInputs.cache b/eDos/obj/Debug/eDos.csproj.CoreCompileInputs.cache
index 37061a4..1109ba2 100644
--- a/eDos/obj/Debug/eDos.csproj.CoreCompileInputs.cache
+++ b/eDos/obj/Debug/eDos.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-5692e76699200c8adeebeefce5ec71ae3b3357a6
+911a17afc7f60d10edd4b9fcc3920c69d84c9b41
diff --git a/eDos/packages.config b/eDos/packages.config
index 8c4358d..fd007e1 100644
--- a/eDos/packages.config
+++ b/eDos/packages.config
@@ -1,5 +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.2.617" targetFramework="net472" />
+  <package id="Telerik.UI.for.AspNet.Ajax.Net45" version="2021.2.616" targetFramework="net472" />
 </packages>
\ No newline at end of file
diff --git a/eDos/web.config b/eDos/web.config
index 89483a0..f7f233a 100644
--- a/eDos/web.config
+++ b/eDos/web.config
@@ -1,67 +1,65 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <connectionStrings>
-    
-    <add name="eDosConnectionString" connectionString="Data Source=hphdb;Initial Catalog=eDos;Integrated Security=True" providerName="System.Data.SqlClient" />
-    <add name="RemsConnectionString" connectionString="Data Source=REMSDB;Initial Catalog=Rems;Integrated Security=True" providerName="System.Data.SqlClient" />
+    <add name="eDosConnectionString" connectionString="Data Source=HPHDB;Initial Catalog=eDos;Integrated Security=True" providerName="System.Data.SqlClient"/>
+    <add name="RemsConnectionString" connectionString="Data Source=REMSDB;Initial Catalog=Rems;Integrated Security=True" providerName="System.Data.SqlClient"/>
   </connectionStrings>
   <appSettings>
-  <add key="Telerik.Web.UI.RenderMode" value="Classic" />
-  <add key="ValidationSettings:UnobtrusiveValidationMode" value="None" />
-  <add key="Telerik.Skin" value="WebBlue" />
-  <add key="Telerik.ScriptManager.TelerikCdn" value="Enabled" />
-  <add key="Telerik.StyleSheetManager.TelerikCdn" value="Enabled" />
+    <add key="Telerik.Web.UI.RenderMode" value="Classic"/>
+    <add key="ValidationSettings:UnobtrusiveValidationMode" value="None"/>
+    <add key="Telerik.Skin" value="WebBlue"/>
+    <add key="Telerik.ScriptManager.TelerikCdn" value="Disabled"/>
+    <add key="Telerik.StyleSheetManager.TelerikCdn" value="Disabled"/>
   </appSettings>
-  <!--
-    For a description of web.config changes see http://go.microsoft.com/fwlink/?LinkId=235367.
-
-    The following attributes can be set on the <httpRuntime> tag.
-      <system.Web>
-        <httpRuntime targetFramework="4.6.1" />
-      </system.Web>
-  -->
   <system.web>
-    <authentication mode="Windows" />
-    <identity impersonate="true" />
-    <customErrors mode="Off" />
-    <compilation targetFramework="4.7.2" debug="true" />
-    <httpRuntime targetFramework="4.7.2" maxRequestLength="4096" executionTimeout="110" />
-    
-    
-    
-  <pages>
+    <authentication mode="Windows"/>
+    <identity impersonate="true"/>
+    <customErrors mode="Off"/>
+    <compilation targetFramework="4.8" debug="true"/>
+    <httpRuntime targetFramework="4.8" maxRequestLength="4096" executionTimeout="110"/>
+    <pages>
       <controls>
-        <add tagPrefix="telerik" namespace="Telerik.Web.UI" assembly="Telerik.Web.UI" />
-	  </controls>
-    </pages><httpHandlers>
-      <add path="ChartImage.axd" type="Telerik.Web.UI.ChartHttpHandler" verb="*" validate="false" />
-      <add path="Telerik.Web.UI.SpellCheckHandler.axd" type="Telerik.Web.UI.SpellCheckHandler" verb="*" validate="false" />
-      <add path="Telerik.Web.UI.DialogHandler.aspx" type="Telerik.Web.UI.DialogHandler" verb="*" validate="false" />
-      <add path="Telerik.RadUploadProgressHandler.ashx" type="Telerik.Web.UI.RadUploadProgressHandler" verb="*" validate="false" />
-      <add path="Telerik.Web.UI.WebResource.axd" type="Telerik.Web.UI.WebResource" verb="*" validate="false" /></httpHandlers><httpModules /></system.web>
+        <add tagPrefix="telerik" namespace="Telerik.Web.UI" assembly="Telerik.Web.UI"/>
+      </controls>
+    </pages>
+    <httpHandlers>
+      <add path="ChartImage.axd" type="Telerik.Web.UI.ChartHttpHandler" verb="*" validate="false"/>
+      <add path="Telerik.Web.UI.SpellCheckHandler.axd" type="Telerik.Web.UI.SpellCheckHandler" verb="*" validate="false"/>
+      <add path="Telerik.Web.UI.DialogHandler.aspx" type="Telerik.Web.UI.DialogHandler" verb="*" validate="false"/>
+      <add path="Telerik.RadUploadProgressHandler.ashx" type="Telerik.Web.UI.RadUploadProgressHandler" verb="*" validate="false"/>
+      <add path="Telerik.Web.UI.WebResource.axd" type="Telerik.Web.UI.WebResource" verb="*" validate="false"/>
+    </httpHandlers>
+    <httpModules/>
+  </system.web>
   <system.webServer>
-    
-    
+
+
     <security>
       <requestFiltering>
-        <requestLimits maxAllowedContentLength="4194304" />
+        <requestLimits maxAllowedContentLength="4194304"/>
       </requestFiltering>
     </security>
     <defaultDocument>
       <files>
-        <add value="TaskBG.aspx" />
+        <add value="TaskBG.aspx"/>
       </files>
     </defaultDocument>
-  <validation validateIntegratedModeConfiguration="false" /><handlers>
-      <remove name="ChartImage_axd" />      
-      <remove name="Telerik_Web_UI_SpellCheckHandler_axd" />
-      <remove name="Telerik_Web_UI_DialogHandler_aspx" />
-      <remove name="Telerik_RadUploadProgressHandler_ashx" />
-      <remove name="Telerik_Web_UI_WebResource_axd" /><add name="ChartImage_axd" path="ChartImage.axd" type="Telerik.Web.UI.ChartHttpHandler" verb="*" preCondition="integratedMode" />
-      <add name="Telerik_Web_UI_SpellCheckHandler_axd" path="Telerik.Web.UI.SpellCheckHandler.axd" type="Telerik.Web.UI.SpellCheckHandler" verb="*" preCondition="integratedMode" />
-      <add name="Telerik_Web_UI_DialogHandler_aspx" path="Telerik.Web.UI.DialogHandler.aspx" type="Telerik.Web.UI.DialogHandler" verb="*" preCondition="integratedMode" />
-      <add name="Telerik_RadUploadProgressHandler_ashx" path="Telerik.RadUploadProgressHandler.ashx" type="Telerik.Web.UI.RadUploadProgressHandler" verb="*" preCondition="integratedMode" />
-      <add name="Telerik_Web_UI_WebResource_axd" path="Telerik.Web.UI.WebResource.axd" type="Telerik.Web.UI.WebResource" verb="*" preCondition="integratedMode" />
-    </handlers></system.webServer>
+    <validation validateIntegratedModeConfiguration="false"/>
+    <handlers>
+      <remove name="ChartImage_axd"/>
+      <remove name="Telerik_Web_UI_SpellCheckHandler_axd"/>
+      <remove name="Telerik_Web_UI_DialogHandler_aspx"/>
+      <remove name="Telerik_RadUploadProgressHandler_ashx"/>
+      <remove name="Telerik_Web_UI_WebResource_axd"/>
+      <add name="ChartImage_axd" path="ChartImage.axd" type="Telerik.Web.UI.ChartHttpHandler" verb="*" preCondition="integratedMode"/>
+      <add name="Telerik_Web_UI_SpellCheckHandler_axd" path="Telerik.Web.UI.SpellCheckHandler.axd" type="Telerik.Web.UI.SpellCheckHandler" verb="*"
+        preCondition="integratedMode"/>
+      <add name="Telerik_Web_UI_DialogHandler_aspx" path="Telerik.Web.UI.DialogHandler.aspx" type="Telerik.Web.UI.DialogHandler" verb="*"
+        preCondition="integratedMode"/>
+      <add name="Telerik_RadUploadProgressHandler_ashx" path="Telerik.RadUploadProgressHandler.ashx" type="Telerik.Web.UI.RadUploadProgressHandler" verb="*"
+        preCondition="integratedMode"/>
+      <add name="Telerik_Web_UI_WebResource_axd" path="Telerik.Web.UI.WebResource.axd" type="Telerik.Web.UI.WebResource" verb="*" preCondition="integratedMode"/>
+    </handlers>
+  </system.webServer>
 </configuration>
 <!--ProjectGuid: 7EC1704D-587D-4AD8-87B0-498C958EBF3C-->
\ No newline at end of file
diff --git a/eDos/web.config.template b/eDos/web.config.template
index 2c1d3af..7471f6c 100644
--- a/eDos/web.config.template
+++ b/eDos/web.config.template
@@ -1,47 +1,39 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <connectionStrings>
-    
-    <add name="eDosConnectionString" connectionString="Data Source=sqltest2;Initial Catalog=eDos;Integrated Security=True" providerName="System.Data.SqlClient" />
+    <add name="eDosConnectionString" connectionString="Data Source=hphdb;Initial Catalog=eDos;Integrated Security=True" providerName="System.Data.SqlClient" />
     <add name="RemsConnectionString" connectionString="Data Source=REMSDB;Initial Catalog=Rems;Integrated Security=True" providerName="System.Data.SqlClient" />
   </connectionStrings>
   <appSettings>
-  <add key="Telerik.Web.UI.RenderMode" value="Classic" />
-  <add key="ValidationSettings:UnobtrusiveValidationMode" value="None" />
-  <add key="Telerik.Skin" value="WebBlue" />
-  <add key="Telerik.ScriptManager.TelerikCdn" value="Enabled" />
-  <add key="Telerik.StyleSheetManager.TelerikCdn" value="Enabled" />
+    <add key="Telerik.Web.UI.RenderMode" value="Classic" />
+    <add key="ValidationSettings:UnobtrusiveValidationMode" value="None" />
+    <add key="Telerik.Skin" value="WebBlue" />
+    <add key="Telerik.ScriptManager.TelerikCdn" value="Disabled" />
+    <add key="Telerik.StyleSheetManager.TelerikCdn" value="Disabled" />
   </appSettings>
-  <!--
-    For a description of web.config changes see http://go.microsoft.com/fwlink/?LinkId=235367.
-
-    The following attributes can be set on the <httpRuntime> tag.
-      <system.Web>
-        <httpRuntime targetFramework="4.6.1" />
-      </system.Web>
-  -->
   <system.web>
     <authentication mode="Windows" />
     <identity impersonate="true" />
     <customErrors mode="Off" />
-    <compilation targetFramework="4.7.2" debug="true" />
-    <httpRuntime targetFramework="4.7.2" maxRequestLength="4096" executionTimeout="110" />
-    
-    
-    
-  <pages>
+    <compilation targetFramework="4.8" debug="true" />
+    <httpRuntime targetFramework="4.8" maxRequestLength="4096" executionTimeout="110" />
+    <pages>
       <controls>
         <add tagPrefix="telerik" namespace="Telerik.Web.UI" assembly="Telerik.Web.UI" />
-	  </controls>
-    </pages><httpHandlers>
+      </controls>
+    </pages>
+    <httpHandlers>
       <add path="ChartImage.axd" type="Telerik.Web.UI.ChartHttpHandler" verb="*" validate="false" />
       <add path="Telerik.Web.UI.SpellCheckHandler.axd" type="Telerik.Web.UI.SpellCheckHandler" verb="*" validate="false" />
       <add path="Telerik.Web.UI.DialogHandler.aspx" type="Telerik.Web.UI.DialogHandler" verb="*" validate="false" />
       <add path="Telerik.RadUploadProgressHandler.ashx" type="Telerik.Web.UI.RadUploadProgressHandler" verb="*" validate="false" />
-      <add path="Telerik.Web.UI.WebResource.axd" type="Telerik.Web.UI.WebResource" verb="*" validate="false" /></httpHandlers><httpModules /></system.web>
+      <add path="Telerik.Web.UI.WebResource.axd" type="Telerik.Web.UI.WebResource" verb="*" validate="false" />
+    </httpHandlers>
+    <httpModules />
+  </system.web>
   <system.webServer>
-    
-    
+
+
     <security>
       <requestFiltering>
         <requestLimits maxAllowedContentLength="4194304" />
@@ -52,16 +44,19 @@
         <add value="TaskBG.aspx" />
       </files>
     </defaultDocument>
-  <validation validateIntegratedModeConfiguration="false" /><handlers>
-      <remove name="ChartImage_axd" />      
+    <validation validateIntegratedModeConfiguration="false" />
+    <handlers>
+      <remove name="ChartImage_axd" />
       <remove name="Telerik_Web_UI_SpellCheckHandler_axd" />
       <remove name="Telerik_Web_UI_DialogHandler_aspx" />
       <remove name="Telerik_RadUploadProgressHandler_ashx" />
-      <remove name="Telerik_Web_UI_WebResource_axd" /><add name="ChartImage_axd" path="ChartImage.axd" type="Telerik.Web.UI.ChartHttpHandler" verb="*" preCondition="integratedMode" />
+      <remove name="Telerik_Web_UI_WebResource_axd" />
+      <add name="ChartImage_axd" path="ChartImage.axd" type="Telerik.Web.UI.ChartHttpHandler" verb="*" preCondition="integratedMode" />
       <add name="Telerik_Web_UI_SpellCheckHandler_axd" path="Telerik.Web.UI.SpellCheckHandler.axd" type="Telerik.Web.UI.SpellCheckHandler" verb="*" preCondition="integratedMode" />
       <add name="Telerik_Web_UI_DialogHandler_aspx" path="Telerik.Web.UI.DialogHandler.aspx" type="Telerik.Web.UI.DialogHandler" verb="*" preCondition="integratedMode" />
       <add name="Telerik_RadUploadProgressHandler_ashx" path="Telerik.RadUploadProgressHandler.ashx" type="Telerik.Web.UI.RadUploadProgressHandler" verb="*" preCondition="integratedMode" />
       <add name="Telerik_Web_UI_WebResource_axd" path="Telerik.Web.UI.WebResource.axd" type="Telerik.Web.UI.WebResource" verb="*" preCondition="integratedMode" />
-    </handlers></system.webServer>
+    </handlers>
+  </system.webServer>
 </configuration>
 <!--ProjectGuid: 7EC1704D-587D-4AD8-87B0-498C958EBF3C-->
\ No newline at end of file
diff --git a/eDosWeb.sln b/eDosWeb.sln
index ad69735..cd710b0 100644
--- a/eDosWeb.sln
+++ b/eDosWeb.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27703.2018
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.31424.327
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "eDos", "eDos\eDos.csproj", "{7EC1704D-587D-4AD8-87B0-498C958EBF3C}"
 EndProject