Finish release/v1.4.1

Finish Release/v1.4.1
openimis · Apr 22, 2020 · 8e4fd97 · 8e4fd97
2 parents 88d4204 + 26ccec7
commit 8e4fd97
Show file tree

Hide file tree

Showing 24 changed files with 7,866 additions and 7,363 deletions.
diff --git a/IMIS/App_GlobalResources/Resource.fr.resx b/IMIS/App_GlobalResources/Resource.fr.resx
diff --git a/IMIS/App_GlobalResources/Resource.resx b/IMIS/App_GlobalResources/Resource.resx
diff --git a/IMIS/AutoCompleteHandlers/AutoCompleteHandler.ashx.vb b/IMIS/AutoCompleteHandlers/AutoCompleteHandler.ashx.vb
@@ -6,9 +6,25 @@ Public Class AutoCompleteHandler
     Implements System.Web.IHttpHandler
     Private FindClaimsB As New IMIS_BI.FindClaimsBI
     Sub ProcessRequest(ByVal context As HttpContext) Implements IHttpHandler.ProcessRequest
-
+        Dim FindClaimsB As New IMIS_BI.FindClaimsBI
         Dim dt As DataTable = FindClaimsB.getAutoCompleteICDCodes(True)
-        Dim d As String = JsonConvert.SerializeObject(dt)
+
+        Dim prefix = String.Empty
+        Dim d = String.Empty
+        prefix = context.Request("ICDCode")
+
+        If prefix = " " Then
+            Dim items = (From p In dt.AsEnumerable()
+                         Select New With {.ICDID = p.Field(Of Integer)("ICDID"),
+                                    .ICDNames = p.Field(Of String)("ICDNames")}).Take(10)
+            d = JsonConvert.SerializeObject(items)
+        Else
+            Dim items = (From p In dt.AsEnumerable()
+                         Select New With {.ICDID = p.Field(Of Integer)("ICDID"),
+                                    .ICDNames = p.Field(Of String)("ICDNames")}).Where(Function(x) x.ICDNames.ToLower.Contains(prefix.ToLower())).Take(10)
+
+            d = JsonConvert.SerializeObject(items)
+        End If
 
         context.Response.ContentType = "text/json"
         context.Response.Write(d)

diff --git a/IMIS/ClaimOverview.aspx b/IMIS/ClaimOverview.aspx
@@ -144,38 +144,34 @@ Title = '<%$ Resources:Resource,L_CLAIMOVERVIEW %>'%>
 
 
     function InitAutoCompl() {
-        $("#<%=txtICDCode.ClientID %>").focus(function () {
-            var datasource;
-            $.ajax({
-                url: 'AutoCompleteHandlers/AutoCompleteHandler.ashx',
-                dataType: "json",
-                type: "GET",
-                async: false,
-                cache: false,
-                success: function (data) {
-                    datasource = data;
-                }
-            });
-            var ds = new AutoCompletedataSource(datasource);
-            $("#<%=txtICDCode.ClientID %>").autocomplete({
-                source: function (request, response) {
-                    var data = ds.filter(request);
-                    response($.map(data, function (item, id) {
-                        return {
-                            label: item.ICDNames, value: item.ICDNames, value2: item.ICDCode, id: item.ICDID
-                        };
-                    }));
-                },
-                select: function (e, u) {
-                    $('#<% = hfICDID.ClientID%>').val(u.item.id);
-                    $('#<% = hfICDCode.ClientID%>').val(u.item.value2);
-                }
-            });
-        });
-        $("#<%=txtICDCode.ClientID %>").change(function () {
-            if ($(this).val() === "") {
-                $('#<% = hfICDID.ClientID%>').val("")
-            }
+        $("#<%=txtICDCode.ClientID %>").autocomplete({
+            source: function (request, response) {
+                $.ajax({
+                    url: 'AutoCompleteHandlers/AutoCompleteHandler.ashx',
+                    // data: JSON.stringify({ prefix: request.term }),
+                    data: { ICDCode: $("#<%=txtICDCode.ClientID %>").val() },
+
+                    dataType: "json",
+                    type: "POST",
+
+                    success: function (data) {
+                        response($.map(data, function (item, id) {
+                            return { label: item.ICDNames, value: item.ICDNames, id: item.ICDID };
+                        }));
+                    },
+                    error: function (response) {
+                        alert(response.responseText);
+                    },
+                    failure: function (response) {
+                        alert(response.responseText);
+                    }
+                });
+            },
+            select: function (e, u) {
+                $('#<% = hfICDID.ClientID%>').val(u.item.id);
+
+            },
+            minLength: 1
         });
     }
 

diff --git a/IMIS/FindClaimAdministrator.aspx b/IMIS/FindClaimAdministrator.aspx
@@ -136,7 +136,7 @@ In case of dispute arising out or in relation to the use of the program, it is s
                     <asp:TextBox ID="txtOtherNames" runat="server"></asp:TextBox>
                 </td>
                 <td class="FormLabel">
-                    <asp:Label ID="lblHFCode" runat="server" Text='<%$ Resources:Resource,L_HF%>'></asp:Label>
+                    <asp:Label ID="lblHFCode" runat="server" Text='<%$ Resources:Resource,L_HFCODE%>'></asp:Label>
                 </td>
                 <td class ="DataEntry">
                     <asp:DropDownList ID="ddlHFCode" runat="server" ></asp:DropDownList>

diff --git a/IMIS/FindClaims.aspx b/IMIS/FindClaims.aspx
@@ -166,42 +166,38 @@ Title = '<%$ Resources:Resource,L_FINDCLAIM %>'%>
             InitAutoCompl();
         }
 
-    function InitAutoCompl() {
-        $("#<%=txtICDCode.ClientID %>").focus(function () {
-            var datasource;
-            $.ajax({
-                url: 'AutoCompleteHandlers/AutoCompleteHandler.ashx',
-                dataType: "json",
-                type: "GET",
-                async: false,
-                cache: false,
-                success: function (data) {
-                    datasource = data;
-                }
-            });
-
-            var ds = new AutoCompletedataSource(datasource);
+        function InitAutoCompl() {
             $("#<%=txtICDCode.ClientID %>").autocomplete({
-                source: function (request, response) {
-                    var data = ds.filter(request);
-                    response($.map(data, function (item, id) {
-                        return {
-                            label: item.ICDNames, value: item.ICDNames, value2: item.ICDCode, id: item.ICDID
-                        };
-                    }));
+              source: function (request, response) {
+                  $.ajax({
+                      url: 'AutoCompleteHandlers/AutoCompleteHandler.ashx',
+                      // data: JSON.stringify({ prefix: request.term }),
+                      data: { ICDCode: $("#<%=txtICDCode.ClientID %>").val() },
+
+                        dataType: "json",
+                        type: "POST",
+
+                        success: function (data) {
+                            response($.map(data, function (item, id) {
+                                return { label: item.ICDNames, value: item.ICDNames, id: item.ICDID };
+                            }));
+                        },
+                        error: function (response) {
+                            alert(response.responseText);
+                        },
+                        failure: function (response) {
+                            alert(response.responseText);
+                        }
+                    });
                 },
                 select: function (e, u) {
                     $('#<% = hfICDID.ClientID%>').val(u.item.id);
-                    $('#<% = hfICDCode.ClientID%>').val(u.item.value2);
-                }
+
+                },
+                minLength: 1
             });
-        });
-        $("#<%=txtICDCode.ClientID %>").change(function () {
-            if ($(this).val() === "") {
-                $('#<% = hfICDID.ClientID%>').val("")
-            }
-        });
-    }
+
+      }
 
 
     $(document).ready(function () {

diff --git a/IMIS/FindPremium.aspx b/IMIS/FindPremium.aspx
@@ -162,7 +162,71 @@ In case of dispute arising out or in relation to the use of the program, it is s
                                         <td class="DataEntry">
                                             <asp:TextBox ID="txtPremiumPaid" runat="server"></asp:TextBox>
                                         </td>
+                                        <td class="FormLabel">
+                                            <asp:Label ID="Label1" runat="server" Text='<%$ Resources:Resource,L_MATCHINGDATEFROM %>'></asp:Label>
+                                             <td class="DataEntry">
+                                            <asp:TextBox
+                                                ID="txtMatchedDateFrom"
+                                                runat="server"
+                                                Width="120px"
+                                                CssClass="dateCheck">
+                                            </asp:TextBox>
+                                            <asp:Button
+                                                ID="btnMatchedDateFrom"
+                                                runat="server"
+                                                Class="dateButton"
+                                                padding-bottom="3px" />
 
+                                            <asp:CalendarExtender
+                                                ID="CalendarExtender4"
+                                                runat="server"
+                                                TargetControlID="txtMatchedDateFrom"
+                                                Format="dd/MM/yyyy"
+                                                PopupButtonID="btnMatchedDateFrom" ClearTime="True">
+                                            </asp:CalendarExtender>
+
+                                        </td>
+                                        <td class="FormLabel"></td>
+                                        <td class="DataEntry"></td>
+                                    </tr>
+                                    <tr>
+                                        <td class="FormLabel">
+                                           <%-- <asp:Label ID="Label1" runat="server" Text='<%$ Resources:Resource, L_RECEIPT %>'></asp:Label>--%>
+                                        </td>
+                                        <td class="DataEntry">
+                                           <%-- <asp:TextBox ID="TextBox1" runat="server"></asp:TextBox>--%>
+                                        </td>
+                                        <td class="FormLabel">
+                                           <%-- <asp:Label ID="Label2" runat="server" Text="<%$ Resources:Resource,L_PREMIUMPAID %>"></asp:Label>--%>
+                                        </td>
+                                        <td class="DataEntry">
+                                          <%--  <asp:TextBox ID="TextBox2" runat="server"></asp:TextBox>--%>
+                                        </td>
+
+                                            <td class="FormLabel">
+                                            <asp:Label ID="Label2" runat="server" Text='<%$ Resources:Resource,L_MATCHINGDATETO %>'></asp:Label>
+                                             <td class="DataEntry">
+                                            <asp:TextBox
+                                                ID="txtMatchedDateTo"
+                                                runat="server"
+                                                Width="120px"
+                                                CssClass="dateCheck">
+                                            </asp:TextBox>
+                                            <asp:Button
+                                                ID="btnMatchedDateTo"
+                                                runat="server"
+                                                Class="dateButton"
+                                                padding-bottom="3px" />
+
+                                            <asp:CalendarExtender
+                                                ID="CalendarExtender2"
+                                                runat="server"
+                                                TargetControlID="txtMatchedDateTo"
+                                                Format="dd/MM/yyyy"
+                                                PopupButtonID="btnMatchedDateTo" ClearTime="True">
+                                            </asp:CalendarExtender>
+
+                                        </td>
                                         <td class="FormLabel"></td>
                                         <td class="DataEntry"></td>
                                     </tr>
@@ -209,7 +273,7 @@ In case of dispute arising out or in relation to the use of the program, it is s
                 EmptyDataText='<%$ Resources:Resource,L_NORECORDS %>'
                 PagerStyle-CssClass="pgr" PageSize="15"
                 AlternatingRowStyle-CssClass="alt"
-                SelectedRowStyle-CssClass="srs" DataKeyNames="FamilyID,PremiumID">
+                SelectedRowStyle-CssClass="srs" DataKeyNames="FamilyID,PremiumUUID">
                 <Columns>
                     <%--  <asp:BoundField DataField="Gender" HeaderText="GENDER" SortExpression="Gender" />
                     <asp:BoundField DataField="DOB" DataFormatString="{0:d}" HeaderText="DATE OF BIRTH" SortExpression="DOB" />
@@ -235,6 +299,8 @@ In case of dispute arising out or in relation to the use of the program, it is s
                         SortExpression="PayType" />
                     <asp:BoundField DataField="Receipt" HeaderText='<%$ Resources:Resource,L_RECEIPT %>'
                         SortExpression="Receipt" />
+                    <asp:BoundField DataField="MatchedAmount" HeaderText='<%$ Resources:Resource,L_MATCHEDAMOUNT %>'
+                        SortExpression="MatchedAmount" />
 
                     <asp:BoundField DataField="ValidityFrom" DataFormatString="{0:d}" HeaderText='<%$ Resources:Resource,L_VALIDFROM %>' SortExpression="ValidityFrom" HeaderStyle-Width="70px">
                         <HeaderStyle Width="70px" />

diff --git a/IMIS/FindPremium.aspx.designer.vb b/IMIS/FindPremium.aspx.designer.vb