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

Unlock VisitIdLocked

Browse source
This commit is contained in:
Luc Vandenbroucke 2020-02-26 15:23:35 +01:00
parent 7da2225e80
commit 3e92388c10
3 changed files with 28 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
eDos/ClearVisitAlarm.aspx
View file

@ -12,13 +12,13 @@
</ExportSettings> </ExportSettings>
<ClientSettings AllowColumnsReorder="True"> <ClientSettings AllowColumnsReorder="True">
</ClientSettings> </ClientSettings>
<MasterTableView DataKeyNames="ID_Station,ID_Visit" CommandItemDisplay="Top" DataSourceID="SqlDSListVistClear" EditMode="EditForms"> <MasterTableView DataKeyNames="ID_STATION,ID_Visit,PersID" CommandItemDisplay="Top" DataSourceID="SqlDSListVistClear" EditMode="EditForms">
<CommandItemSettings ShowExportToExcelButton="True" ShowAddNewRecordButton="False" /> <CommandItemSettings ShowExportToExcelButton="True" ShowAddNewRecordButton="False" />
<Columns> <Columns>
<telerik:GridButtonColumn CommandName="Edit" Text="Edit" ButtonCssClass="rgEdit" UniqueName="EditColumn" HeaderStyle-Width="30px"> <telerik:GridButtonColumn CommandName="Edit" Text="Edit" ButtonCssClass="rgEdit" UniqueName="EditColumn" HeaderStyle-Width="30px">
<HeaderStyle Width="30px"></HeaderStyle> <HeaderStyle Width="30px"></HeaderStyle>
</telerik:GridButtonColumn> </telerik:GridButtonColumn>
<telerik:GridBoundColumn DataField="ID_Station" DataType="System.Int32" MaxLength="3" HeaderText="Station" ReadOnly="True" SortExpression="ID_Station" UniqueName="ID_Station"/> <telerik:GridBoundColumn DataField="ID_STATION" DataType="System.Int32" MaxLength="3" HeaderText="Station" ReadOnly="True" SortExpression="ID_STATION" UniqueName="ID_STATION"/>
<telerik:GridBoundColumn DataField="ID_Visit" DataType="System.Int32" MaxLength="10" HeaderText="ID" ReadOnly="True" SortExpression="ID_Visit" UniqueName="ID_Visit"/> <telerik:GridBoundColumn DataField="ID_Visit" DataType="System.Int32" MaxLength="10" HeaderText="ID" ReadOnly="True" SortExpression="ID_Visit" UniqueName="ID_Visit"/>
<telerik:GridCheckBoxColumn DataField="isAlarmCleared" DataType="System.Boolean" HeaderText="Cleared ?" SortExpression="isAlarmCleared" UniqueName="isAlarmCleared" Groupable="False"> <telerik:GridCheckBoxColumn DataField="isAlarmCleared" DataType="System.Boolean" HeaderText="Cleared ?" SortExpression="isAlarmCleared" UniqueName="isAlarmCleared" Groupable="False">
</telerik:GridCheckBoxColumn> </telerik:GridCheckBoxColumn>
@ -77,10 +77,14 @@
<asp:SqlDataSource ID="SqlDSListVistClear" runat="server" ConnectionString="<%$ ConnectionStrings:eDosConnectionString %>" <asp:SqlDataSource ID="SqlDSListVistClear" runat="server" ConnectionString="<%$ ConnectionStrings:eDosConnectionString %>"
SelectCommand="VisitsToClearSelect" SelectCommandType="StoredProcedure" SelectCommand="VisitsToClearSelect" SelectCommandType="StoredProcedure"
UpdateCommand="VisitsToClearUpdate" UpdateCommandType="StoredProcedure"> UpdateCommand="VisitsToClearUpdate" UpdateCommandType="StoredProcedure">
<SelectParameters>
<asp:Parameter Direction="ReturnValue" Name="RETURN_VALUE" Type="Int32" />
</SelectParameters>
<UpdateParameters> <UpdateParameters>
<asp:Parameter Name="ID_Station" Type="Int32" /> <asp:Parameter Name="ID_STATION" Type="Int32" />
<asp:Parameter Name="ID_Visit" Type="Int32" /> <asp:Parameter Name="ID_Visit" Type="Int32" />
<asp:Parameter Name="isAlarmCleared" Type="Boolean" /> <asp:Parameter Name="isAlarmCleared" Type="Boolean" />
<asp:Parameter Name="PersID" Type="Int32" />
</UpdateParameters> </UpdateParameters>
</asp:SqlDataSource> </asp:SqlDataSource>

53
eDos/Worker.aspx
View file

@ -81,44 +81,31 @@
<td style="color: darkblue; font-weight: bold; text-decoration: underline; font-size: 20px"> <td style="color: darkblue; font-weight: bold; text-decoration: underline; font-size: 20px">
<asp:Label ID="Label22" runat="server" Text="Access allowed to controlled area ?"></asp:Label> <asp:Label ID="Label22" runat="server" Text="Access allowed to controlled area ?"></asp:Label>
</td> </td>
</tr>
<tr>
<td style="color: darkblue; font-weight: bold; font-family: Arial;">
<asp:Label ID="Label21" runat="server" Text="1. Check in the folder 'Limit' below that the Margin is high enough for the 'Min. margin for the task'. If that is not the case you can add some Limits. Go to Alarm/Add limit."></asp:Label>
</td>
</tr>
<tr>
<td style="color: darkblue; font-weight: bold">
<asp:Label ID="Label23" runat="server" CssClass="rdfLabel rdfBlock" Text="2. Check in the 'General Informations' that the Code at the medical Service is not D1. If that is the case that person is not allow to access the Controlled area for medical reason."></asp:Label>
</td>
</tr>
<tr>
<td style="color: darkblue; font-weight: bold">
<asp:Label ID="Label18" runat="server" CssClass="rdfLabel rdfBlock" Text="3. Check if a Visit needs to be cleared (alarm on the EPD during the visit). Last ID visit to clear:"></asp:Label>
</td>
<td style="color: darkblue; font-weight: bold">
<asp:Label ID="Label19" runat="server" CssClass="rdfFieldValue" Text='<%# Eval("StationVisitIDLocked") %>' />
</td>
</tr>
<tr>
<td style="color: darkblue">
<asp:Label ID="Label20" runat="server" CssClass="rdfLabel rdfBlock" Text="(To clear it go to Worker/Clear Visit Alarm and select the person. Clear all the alarm for that person)"></asp:Label>
</td>
</tr>
<tr>
<td style="color: darkblue; font-weight: bold">
<asp:Label Style="color: darkblue;" ID="Label13" runat="server" AssociatedControlID="AccessAllowCheckBox" CssClass="rdfLabel rdfBlock" Text="4. Check that the Quiz, WBC, Medical.. are in orde ? If that is not the case you can give access for today via the button bellow."></asp:Label>
</td>
<td style="color: darkblue; font-weight: bold"> <td style="color: darkblue; font-weight: bold">
<asp:CheckBox ID="AccessAllowCheckBox" runat="server" Enabled="false" Checked='<%# Eval("AccessAllow") %>' /> <asp:CheckBox ID="AccessAllowCheckBox" runat="server" Enabled="false" Checked='<%# Eval("AccessAllow") %>' />
</td> </td>
</tr> </tr>
<tr>
<td>1. Check in the folder 'Limit' below that the Margin is high enough for the 'Min. margin for the task'. If that is not the case you can add some Limits. Go to Alarm/Add limit.
</td>
</tr>
<tr>
<td>2. Check in the 'General Informations' that the Code at the medical Service is not D1. If that is the case that person is not allow to access the Controlled area for medical reason.
</td>
</tr>
<tr>
<td>3. Check if a Visit needs to be cleared (alarm on the EPD during the visit). Last ID visit to clear:<br />
(To clear it go to Worker/Clear Visit Alarm and select the person. Clear all the alarm for that person)
</td>
<td>
<asp:Label runat="server" Text='<%# Eval("StationVisitIDLocked") %>' BorderStyle="Solid" BorderWidth="1px" Width="20px" Height="10px" />
</td>
</tr>
<tr>
<td>4. Check that the Quiz, WBC, Medical.. are in orde ? If that is not the case you can give access for today via the button bellow.
</td>
</tr>
</table> </table>
<div class="rdfCommandButtons"> <div class="rdfCommandButtons">

2
eDos/eDos.csproj.user
View file

@ -15,7 +15,7 @@
<VisualStudio> <VisualStudio>
<FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}"> <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
<WebProjectProperties> <WebProjectProperties>
<StartPageUrl>Rems/RemsUnitTaskPersonVisits.aspx</StartPageUrl> <StartPageUrl>ClearVisitAlarm.aspx</StartPageUrl>
<StartAction>SpecificPage</StartAction> <StartAction>SpecificPage</StartAction>
<AspNetDebugging>True</AspNetDebugging> <AspNetDebugging>True</AspNetDebugging>
<SilverlightDebugging>False</SilverlightDebugging> <SilverlightDebugging>False</SilverlightDebugging>