change to eDos db

2021-07-05 16:26:51 +02:00 · 2021-07-05 16:26:51 +02:00 · 52f83f9eff
commit 52f83f9eff
parent f3321c1dd0
5 changed files with 31 additions and 26 deletions
--- a/eDos/Rems/BR2Cycli.aspx
+++ b/eDos/Rems/BR2Cycli.aspx
@ -16,7 +16,11 @@
            </Columns>
        </MasterTableView>
 </telerik:RadGrid>
-<asp:SqlDataSource ID="SqlDSRems5" runat="server" ConnectionString="<%$ ConnectionStrings:RemsConnectionString %>" SelectCommand="SELECT * FROM [br2Cycli]" DeleteCommand="DELETE FROM [br2Cycli] WHERE [id] = @id" InsertCommand="INSERT INTO [br2Cycli] ([tp], [year], [seq], [van], [tot]) VALUES (@tp, @year, @seq, @van, @tot)" UpdateCommand="UPDATE [br2Cycli] SET [tp] = @tp, [year] = @year, [seq] = @seq, [van] = @van, [tot] = @tot WHERE [id] = @id">
+<asp:SqlDataSource ID="SqlDSRems5" runat="server" ConnectionString="<%$ ConnectionStrings:eDosConnectionString %>" 
+    SelectCommand="[br2cycliSelect]" SelectCommandType="StoredProcedure" 
+    DeleteCommand="DELETE FROM [br2Cycli] WHERE [id] = @id" 
+    InsertCommand="INSERT INTO [br2Cycli] ([tp], [year], [seq], [van], [tot]) VALUES (@tp, @year, @seq, @van, @tot)" 
+    UpdateCommand="UPDATE [br2Cycli] SET [tp] = @tp, [year] = @year, [seq] = @seq, [van] = @van, [tot] = @tot WHERE [id] = @id">
    <DeleteParameters>
        <asp:Parameter Name="id" Type="Int32" />
    </DeleteParameters>
--- a/eDos/Rems/RemsNeutron.aspx
+++ b/eDos/Rems/RemsNeutron.aspx
@ -1,4 +1,5 @@
-<%@ Page Title="" Language="C#" MasterPageFile="~/Site.master" AutoEventWireup="true" CodeBehind="RemsNeutron.aspx.cs" Inherits="Rems2018.Rems.RemsNeutron" %>
+<%@ Page Title="Neutron" Language="C#" MasterPageFile="~/Site.master" AutoEventWireup="true" CodeBehind="RemsNeutron.aspx.cs" Inherits="Rems2018.Rems.RemsNeutron" %>
+
 <asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" runat="server">

    <telerik:RadGrid ID="RadGrid1" runat="server" CellSpacing="-1" DataSourceID="SqlDataSource1" GridLines="Both" GroupPanelPosition="Top" AllowFilteringByColumn="True" AllowSorting="True" AutoGenerateColumns="False" ShowGroupPanel="True">
@ -11,14 +12,14 @@
                <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="Hp10" DataType="System.Decimal" HeaderText="Hp10" SortExpression="Hp10" UniqueName="Hp10" />
+                <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>
+    </telerik:RadGrid>
+    <asp:SqlDataSource ID="SqlDataSource1" runat="server" ConnectionString="<%$ ConnectionStrings:eDosConnectionString %>"
+        SelectCommand="[IsabelleReportEpdN]" SelectCommandType="StoredProcedure"></asp:SqlDataSource>
 </asp:Content>
--- a/eDos/Rems/RemsUnitTaskPerson.aspx
+++ b/eDos/Rems/RemsUnitTaskPerson.aspx
@ -82,7 +82,8 @@
        </MasterTableView>
    </telerik:RadGrid>

-    <asp:SqlDataSource ID="SqlDSRems" runat="server" ConnectionString="<%$ ConnectionStrings:RemsConnectionString %>" SelectCommand="ReportUnitPersDoseTask" SelectCommandType="StoredProcedure">
+    <asp:SqlDataSource ID="SqlDSRems" runat="server" ConnectionString="<%$ ConnectionStrings:RemsConnectionString %>" 
+        SelectCommand="ReportUnitPersDoseTask" SelectCommandType="StoredProcedure">
        <SelectParameters>
            <asp:ControlParameter ControlID="RadComboBox1" DefaultValue="3" Name="unit" PropertyName="SelectedValue" Type="Int32" />
            <asp:ControlParameter ControlID="RadDateInput1" DefaultValue="2014-01-01" Name="mindate" PropertyName="SelectedDate" Type="DateTime" />
--- a/eDos/Reports/RemsByTaskPeriod.aspx
+++ b/eDos/Reports/RemsByTaskPeriod.aspx
@ -25,10 +25,10 @@
                                <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="HP07" HeaderText="Hp07" ReadOnly="True" SortExpression="HP07" UniqueName="HP07" DataFormatString="{0:0.00}" />
+                                <telerik:GridBoundColumn DataField="HP10"  HeaderText="Hp10" ReadOnly="True" SortExpression="HP10" UniqueName="HP10" DataFormatString="{0:0.00}" />
+                                <telerik:GridBoundColumn DataField="HPN"  HeaderText="HPN" ReadOnly="True" SortExpression="HPN" UniqueName="HPN" DataFormatString="{0:0.00}" />
+                                <telerik:GridBoundColumn DataField="HPG"  HeaderText="HP10G" ReadOnly="True" SortExpression="HPG" UniqueName="HPG" 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" />
@ -52,11 +52,11 @@
                        <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="HP07" HeaderText="Hp07" ReadOnly="True" SortExpression="HP07" UniqueName="HP07" DataFormatString="{0:0.00}" />
+                                <telerik:GridBoundColumn DataField="HP10"  HeaderText="Hp10" ReadOnly="True" SortExpression="HP10" UniqueName="HP10" DataFormatString="{0:0.00}" />
+                                <telerik:GridBoundColumn DataField="HPN"  HeaderText="HPN" ReadOnly="True" SortExpression="HPN" UniqueName="HPN" DataFormatString="{0:0.00}" />
+                                <telerik:GridBoundColumn DataField="HPG"  HeaderText="HP10G" ReadOnly="True" SortExpression="HPG" UniqueName="HPG" 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>
@ -66,10 +66,10 @@
                <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="HP07" HeaderText="Hp07" ReadOnly="True" SortExpression="HP07" UniqueName="HP07" DataFormatString="{0:0.00}" />
+                                <telerik:GridBoundColumn DataField="HP10"  HeaderText="Hp10" ReadOnly="True" SortExpression="HP10" UniqueName="HP10" DataFormatString="{0:0.00}" />
+                                <telerik:GridBoundColumn DataField="HPN"  HeaderText="HPN" ReadOnly="True" SortExpression="HPN" UniqueName="HPN" DataFormatString="{0:0.00}" />
+                                <telerik:GridBoundColumn DataField="HPG"  HeaderText="HP10G" ReadOnly="True" SortExpression="HPG" UniqueName="HPG" 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" />
@ -79,10 +79,9 @@
                <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" />
+                <telerik:GridBoundColumn DataField="minDate" DataType="System.DateTime" HeaderText="minDate" ReadOnly="True" SortExpression="minDate" UniqueName="minDate" DataFormatString="{0:yyyy-MM-dd HH:mm}" />
+                <telerik:GridBoundColumn DataField="maxDate" DataType="System.DateTime" HeaderText="maxDate" ReadOnly="True" SortExpression="maxDate" UniqueName="maxDate" DataFormatString="{0:yyyy-MM-dd HH:mm}"/>
            </Columns>
-
        </MasterTableView>
    </telerik:RadGrid>
    <asp:SqlDataSource ID="dsEDOS" runat="server" ConnectionString="<%$ ConnectionStrings:eDosConnectionString %>"
--- a/eDos/eDos.csproj.user
+++ b/eDos/eDos.csproj.user
@ -15,7 +15,7 @@
    <VisualStudio>
      <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
        <WebProjectProperties>
-          <StartPageUrl>Worker.aspx</StartPageUrl>
+          <StartPageUrl>Rems/RemsNeutron.aspx</StartPageUrl>
          <StartAction>SpecificPage</StartAction>
          <AspNetDebugging>True</AspNetDebugging>
          <SilverlightDebugging>False</SilverlightDebugging>