Bump nokogiri from 1.10.10 to 1.13.6

Dockerfile

@@ -2,7 +2,7 @@ FROM ruby:2.3.3
 
 RUN curl -sL https://deb.nodesource.com/setup_12.x | bash -
 RUN curl --silent https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add -
-RUN apt-get update -qq && apt-get install -y nodejs postgresql-client fonts-khmeros
+RUN apt-get update -qq && apt-get install -y nodejs postgresql-client fonts-khmeros memcached
 RUN mkdir /app
 WORKDIR /app
 
@@ -30,6 +30,7 @@ RUN bundle install --verbose --jobs 20 --retry 5
 RUN gem install solargraph -v 0.39.17 --force
 RUN npm install -g yarn
 RUN yarn install --check-files
+RUN service memcached start
 
 # Copy the main application.
 COPY . ./

Gemfile

@@ -77,6 +77,7 @@ gem 'enumerize', '~> 2.3.1'
 gem 'ulid',                   '~> 1.2'
 gem 'aws-healthcheck'
 gem 'redis-session-store',    '~> 0.11.3'
+gem 'dalli', '~> 2.7', '>= 2.7.11'
 
 group :development, :test do
   gem 'pry'
@@ -117,6 +118,7 @@ group :development do
   gem 'metainspector'
   gem 'flay',                 '~> 2.12', '>= 2.12.1'
   gem 'active_record_doctor', '~> 1.8'
+  gem 'lol_dba', '~> 2.2'
 end
 
 group :test do

Gemfile.lock

@@ -155,6 +155,7 @@ GEM
       colored2 (~> 3.1)
     crass (1.0.6)
     daemons (1.3.1)
+    dalli (2.7.11)
     danger (5.16.1)
       claide (~> 1.0)
       claide-plugins (>= 0.9.2)
@@ -512,6 +513,10 @@ GEM
     logging (2.2.2)
       little-plugger (~> 1.1)
       multi_json (~> 1.10)
+    lol_dba (2.2.0)
+      actionpack (>= 3.0, < 7.0)
+      activerecord (>= 3.0, < 7.0)
+      railties (>= 3.0, < 7.0)
     loofah (2.13.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
@@ -536,7 +541,7 @@ GEM
     mime-types-data (3.2022.0105)
     mini_magick (4.5.1)
     mini_mime (0.1.4)
-    mini_portile2 (2.4.0)
+    mini_portile2 (2.8.0)
     minitest (5.15.0)
     momentjs-rails (2.17.1)
       railties (>= 3.1)
@@ -568,8 +573,8 @@ GEM
       net-ssh (>= 2.6.5, < 7.0.0)
     net-ssh (6.1.0)
     no_proxy_fix (0.1.2)
-    nokogiri (1.10.10)
-      mini_portile2 (~> 2.4.0)
+    nokogiri (1.13.6)
+      mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     nokogumbo (2.0.2)
       nokogiri (~> 1.8, >= 1.8.4)
@@ -610,7 +615,7 @@ GEM
       slop (~> 3.4)
     pundit (1.1.0)
       activesupport (>= 3.0.0)
-    racc (1.5.2)
+    racc (1.6.0)
     rack (1.6.13)
     rack-cors (1.0.6)
       rack (>= 1.6.0)
@@ -897,6 +902,7 @@ DEPENDENCIES
   chartkick (~> 3.4)
   cocoon (~> 1.2, >= 1.2.9)
   coffee-rails (~> 4.1.0)
+  dalli (~> 2.7, >= 2.7.11)
   danger (~> 5.16, >= 5.16.1)
   database_cleaner (~> 1.5, >= 1.5.1)
   datagrid (~> 1.4.2)
@@ -931,6 +937,7 @@ DEPENDENCIES
   launchy (~> 2.4, >= 2.4.3)
   letter_opener (~> 1.4.1)
   letter_opener_web (~> 1.3, >= 1.3.4)
+  lol_dba (~> 2.2)
   mail_interceptor (~> 0.0.7)
   metainspector
   mini_magick (~> 4.5)

app/assets/javascripts/dashboards/index.coffee

@@ -12,7 +12,7 @@ CIF.DashboardsIndex = do ->
     # _clientStatusChart()
     _familyType()
     _resizeChart()
-    _clientProgramStreamByGender()
+    # _clientProgramStreamByGender()
     _clientProgramStream()
     _initSelect2()
     _openTaskListModal()
@@ -28,6 +28,8 @@ CIF.DashboardsIndex = do ->
     _loadModalReminder()
     _handleSearchClient()
     _handleMultiFormAssessmentCaseNote()
+    _loadSteps()
+    _search_client_date_logic_error()
 
   _loadModalReminder = ->
     if localStorage.getItem('from login') == 'true'
@@ -94,8 +96,34 @@ CIF.DashboardsIndex = do ->
     element = $('#client-program-stream')
     data    = $(element).data('content-count')
     title    = $(element).data('title')
+
+    programNames = [
+                  data[0].active_data.map(({name}) ->
+                    name
+                  )
+                  data[1].active_data.map(({name}) ->
+                    name
+                  )
+                  data[2].active_data.map(({name}) ->
+                    name
+                  )
+                ]
+
+    categories = _.uniq(_.flatten(programNames))
+    data =
+      categories: categories
+      series: data.map (element, index) ->
+        {
+          name: element['name']
+          data: data[index].active_data.map((subElement) ->
+            subElement['y']
+          )
+          color: if index == 0 then '#f9c00c' else if index == 1 then '#4caf50' else '#00695c'
+        }
+
+    debugger;
     report = new CIF.ReportCreator(data, title, '', element)
-    report.donutChart()
+    report.barChart()
 
   _clientProgramStream = ->
     element = $('#client-by-program-stream')
@@ -337,4 +365,118 @@ CIF.DashboardsIndex = do ->
       $("ul#casenote-tab-dropdown a").addClass('disabled')
 
 
+  _loadSteps = (form) ->
+    bodyTag = 'div'
+    rootId = "#rootwizard"
+    that = @
+    $(rootId).steps
+      headerTag: 'h4'
+      bodyTag: bodyTag
+      enableAllSteps: true
+      transitionEffect: 'slideLeft'
+      autoFocus: true
+      titleTemplate: '#title#'
+      labels:
+        finish: $(rootId).data('finish')
+        next: $(rootId).data('next')
+        previous: $(rootId).data('previous')
+      onInit: (event, currentIndex) ->
+        currentTab  = "#{rootId}-p-#{currentIndex}"
+        _clientProgramStreamByGender()
+        return
+
+      onStepChanging: (event, currentIndex, newIndex) ->
+        console.log 'onStepChanging'
+        currentTab  = "#{rootId}-p-#{currentIndex}"
+        return true
+
+      onStepChanged: (event, currentIndex, priorIndex) ->
+        console.log 'onStepChanged'
+        currentTab  = "#{rootId}-p-#{currentIndex}"
+        currentStep = $("#{rootId}-p-" + currentIndex)
+        if $("#{currentTab} #active-client:visible").length
+          url = $("#active-client").data('url')
+          _active_client_by_gender(url)
+        else if $("#{currentTab} #active-case-by-donor:visible").length
+          url = $("#active-case-by-donor").data('url')
+          _active_case_by_donor(url)
+
+  _active_client_by_gender = (url) ->
+    element = $('#active-client')
+    male = $("#rootwizard").data('male')
+    female = $("#rootwizard").data('female')
+    other = $("#rootwizard").data('other')
+    title = element.data('title')
+    $.ajax
+      type: 'get'
+      url: url
+      dataType: 'JSON'
+      success: (response) ->
+        data =
+          categories: [
+            'Children'
+            'Adult'
+            'Other'
+          ]
+          series: [
+            {
+              name: female
+              data: [
+                response.girls
+                response.adult_females
+                0
+              ]
+              color: '#f9c00c'
+            }
+            {
+              name: male
+              data: [
+                response.boys
+                response.adult_males
+                0
+              ]
+              color: '#4caf50'
+            },
+            {
+              name: other
+              data: [0, 0, response.others]
+              color: '#00695c'
+            }
+          ]
+
+        report = new CIF.ReportCreator(data, title, '', element)
+        report.columnChart()
+      error: (response, status, msg) ->
+        return
+
+  _active_case_by_donor = (url) ->
+    element = $('#active-case-by-donor')
+    title = element.data('title')
+    $.ajax
+      type: 'get'
+      url: url
+      dataType: 'JSON'
+      success: (response) ->
+        report = new CIF.ReportCreator(response.data, title, '', element)
+        report._highChartsPieChart()
+      error: (response, status, msg) ->
+        return
+
+  # Make monochrome colors
+  _pieColors = do ->
+    colors = []
+    base = Highcharts.getOptions().colors[2]
+    i = undefined
+    i = 0
+    while i < 50
+      # Start out with a darkened base color (negative brighten), and end
+      # up with a much brighter color
+      colors.push Highcharts.color(base).brighten((i - 5) / 7).get()
+      i += 1
+    colors
+
+  _search_client_date_logic_error = ->
+    $('a[href="#data-validation"]').on 'click', ->
+      $('#client-date-logic-error').submit()
+
   { init: _init }