+
diff --git a/app/views/detsis/sdp_codes/_search.html.erb b/app/views/detsis/sdp_codes/_search.html.erb
new file mode 100644
index 000000000..e1d1adaa6
--- /dev/null
+++ b/app/views/detsis/sdp_codes/_search.html.erb
@@ -0,0 +1,45 @@
+
+
+
+
+
+ <%= t('.card_header') %>
+
+
+
+
+ <%= render 'card',
+ count: SdpCode.count,
+ path: detsis_sdp_codes_path,
+ title: '.sdp_codes' %>
+
+
+
diff --git a/app/views/detsis/sdp_codes/index.html.erb b/app/views/detsis/sdp_codes/index.html.erb
new file mode 100644
index 000000000..af06c2cab
--- /dev/null
+++ b/app/views/detsis/sdp_codes/index.html.erb
@@ -0,0 +1,41 @@
+
+
+
+
+
+ <%= t('search') %>
+
+
+
+
+
+ <%= t('search') %>
+
+
+ <%= link_to t('reset'), detsis_sdp_codes_path, class: 'btn btn-warning btn-sm' %>
+
+
+
+
+
+ <%= form_tag detsis_sdp_codes_path, method: :get do %>
+
+
+
+
+
+
+ <%= label_tag :term, t('smart_search') %>
+ <%= text_field_tag :term,
+ params[:term],
+ placeholder: t('.smart_search_placeholder'),
+ class: 'form-control' %>
+
+
+
+ <% end %>
+
+ <%= submit_tag t('search'), class: 'btn btn-primary' %>
+
+
+
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index a9af83ea1..58e209865 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -4,6 +4,7 @@
<%= render 'layouts/shared/meta' %>
<%= stylesheet_link_tag 'application', media: 'all' %>
<%= javascript_include_tag 'application' %>
+ <%= javascript_pack_tag 'application', 'data-turbolinks-track': 'reload', async: true %>
diff --git a/app/views/layouts/components/_content_loader_basic.html.erb b/app/views/layouts/components/_content_loader_basic.html.erb
new file mode 100644
index 000000000..72dc351fa
--- /dev/null
+++ b/app/views/layouts/components/_content_loader_basic.html.erb
@@ -0,0 +1,5 @@
+
+
+
+
+
+
+ <%= fa_icon 'align-justify', text: t('.card_header') %>
+
+
+ <%= render 'search' %>
+
+
+
+
+ | <%= t('.name') %> | +<%= t('.main') %> | +<%= t('.first') %> | +<%= t('.second') %> | +<%= t('.third') %> | +<%= t('.full_code') %> | +
|---|---|---|---|---|---|
| <%= code.name %> | +<%= code.main %> | +<%= code.first %> | +<%= code.second %> | +<%= code.third %> | +<%= code.full_code %> | +
+
+ <%= render 'layouts/components/loading' %>
+
diff --git a/app/views/layouts/components/_content_loader_panel.html.erb b/app/views/layouts/components/_content_loader_panel.html.erb
new file mode 100644
index 000000000..c3bbadeec
--- /dev/null
+++ b/app/views/layouts/components/_content_loader_panel.html.erb
@@ -0,0 +1,49 @@
+
+ data-content-loader-refresh-interval="<%= refresh.interval %>"
+ <% end %>>
+
diff --git a/app/views/layouts/components/_loading.html.erb b/app/views/layouts/components/_loading.html.erb
new file mode 100644
index 000000000..2fb7bf773
--- /dev/null
+++ b/app/views/layouts/components/_loading.html.erb
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
+ <%= header %>
+
+
+
+
+
+
+
+ <% if refresh.auto %>
+
+
+
+ <% end %>
+
+
+ <%= content %>
+ <%= render 'layouts/components/loading' %>
+
+
+
diff --git a/app/views/layouts/shared/_sidebar.html.erb b/app/views/layouts/shared/_sidebar.html.erb
index dcf179e41..6c8a97c8a 100644
--- a/app/views/layouts/shared/_sidebar.html.erb
+++ b/app/views/layouts/shared/_sidebar.html.erb
@@ -6,11 +6,6 @@
<%= fa_icon('home', class: 'nav-icon') %> <%= t('home_nav') %>
<% end %>
-
+
+
+ <%= t('loading') %>
+
+ <%= t('loading') %>
+
+
diff --git a/app/views/studies/articles/index.html.erb b/app/views/manager/stats/articles/index.html.erb
similarity index 100%
rename from app/views/studies/articles/index.html.erb
rename to app/views/manager/stats/articles/index.html.erb
diff --git a/app/views/manager/stats/employees/academic.html.erb b/app/views/manager/stats/employees/academic.html.erb
new file mode 100644
index 000000000..9aad28dbb
--- /dev/null
+++ b/app/views/manager/stats/employees/academic.html.erb
@@ -0,0 +1 @@
+<%= column_chart @series, title: t('.title'), adapter: :highcharts %>
diff --git a/app/views/manager/stats/employees/index.html.erb b/app/views/manager/stats/employees/index.html.erb
new file mode 100644
index 000000000..da0873df7
--- /dev/null
+++ b/app/views/manager/stats/employees/index.html.erb
@@ -0,0 +1,5 @@
+
+
+
+
+
+
+
+ <%= fa_icon 'graduation-cap' %>
+
+
+
+
+
+ <%= Xokul::Ubs::Statistic::Student.by_genders.sum { |item| item[:number_of_students] } %>
+ <%= t('.student') %>
+
+
+
+
+ <%= fa_icon 'users' %>
+
+
+
+
+
+ <%= Employee.active.distinct(:user_id).count %>
+ <%= t('.employee') %>
+
+
+
+
+ <%= fa_icon 'book' %>
+
+
+
+
+
+ <%= Article.count %>
+ <%= t('.academic_publishing') %>
+
+ <%= content_loader_tag(manager_students_path) %>
+
+
+
+ <%= render 'layouts/components/loading' %>
+
+
+
diff --git a/app/views/manager/stats/students/cities.html.erb b/app/views/manager/stats/students/cities.html.erb
new file mode 100644
index 000000000..07b1ada47
--- /dev/null
+++ b/app/views/manager/stats/students/cities.html.erb
@@ -0,0 +1,46 @@
+
+
+
diff --git a/app/views/manager/stats/students/double_major_and_minor.html.erb b/app/views/manager/stats/students/double_major_and_minor.html.erb
new file mode 100644
index 000000000..0dbe413ad
--- /dev/null
+++ b/app/views/manager/stats/students/double_major_and_minor.html.erb
@@ -0,0 +1,35 @@
+
+
+
diff --git a/app/views/manager/stats/students/genders.html.erb b/app/views/manager/stats/students/genders.html.erb
new file mode 100644
index 000000000..f7f2d0900
--- /dev/null
+++ b/app/views/manager/stats/students/genders.html.erb
@@ -0,0 +1,37 @@
+
+
+
diff --git a/app/views/manager/stats/students/genders_and_degrees.html.erb b/app/views/manager/stats/students/genders_and_degrees.html.erb
new file mode 100644
index 000000000..9a567c42b
--- /dev/null
+++ b/app/views/manager/stats/students/genders_and_degrees.html.erb
@@ -0,0 +1,34 @@
+
+
+
diff --git a/app/views/manager/stats/students/index.html.erb b/app/views/manager/stats/students/index.html.erb
new file mode 100644
index 000000000..7c7fcd576
--- /dev/null
+++ b/app/views/manager/stats/students/index.html.erb
@@ -0,0 +1,20 @@
+<%= javascript_include_tag 'chart' %>
+<%= javascript_include_tag 'highcharts-langs/tr' if I18n.locale == :tr %>
+
+
+ <%= content_loader_panel_tag(manager_employees_academic_path, refresh: { auto: true }) %>
+
+
+
diff --git a/app/views/manager/stats/students/non_graduates.html.erb b/app/views/manager/stats/students/non_graduates.html.erb
new file mode 100644
index 000000000..c12fa3691
--- /dev/null
+++ b/app/views/manager/stats/students/non_graduates.html.erb
@@ -0,0 +1,32 @@
+
+
+
diff --git a/app/views/studentship/course_enrollments/_available_courses.html.erb b/app/views/studentship/course_enrollments/_available_courses.html.erb
index ed018f910..cd6310295 100644
--- a/app/views/studentship/course_enrollments/_available_courses.html.erb
+++ b/app/views/studentship/course_enrollments/_available_courses.html.erb
@@ -11,6 +11,7 @@
+ <%= content_loader_panel_tag(manager_students_cities_path, refresh: { auto: true }) %>
+
+
+ <%= content_loader_panel_tag(manager_students_genders_path, refresh: { auto: true }) %>
+
+
+ <%= content_loader_panel_tag(manager_students_genders_and_degrees_path, refresh: { auto: true }) %>
+
+
+ <%= content_loader_panel_tag(manager_students_double_major_and_minor_path, refresh: { auto: true }) %>
+
+
+ <%= content_loader_panel_tag(manager_students_non_graduates_path, refresh: { auto: true }) %>
+
+
+
+<% end %>
+
<%= t('.courses_with_full_quota') %>
+
diff --git a/app/views/studies/certifications/index.html.erb b/app/views/studies/certifications/index.html.erb
deleted file mode 100644
index e69de29bb..000000000
diff --git a/app/views/studies/dashboard/index.html.erb b/app/views/studies/dashboard/index.html.erb
deleted file mode 100644
index 128744b50..000000000
--- a/app/views/studies/dashboard/index.html.erb
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
diff --git a/app/views/studies/projects/index.html.erb b/app/views/studies/projects/index.html.erb
deleted file mode 100644
index e69de29bb..000000000
diff --git a/babel.config.js b/babel.config.js
index f930f3e0a..306ab99f6 100644
--- a/babel.config.js
+++ b/babel.config.js
@@ -1,4 +1,4 @@
-module.exports = function(api) {
+module.exports = function (api) {
var validEnv = ['development', 'test', 'production']
var currentEnv = api.env()
var isDevelopmentEnv = api.env('development')
diff --git a/config/locales/controllers/detsis/dashboard.en.yml b/config/locales/controllers/detsis/dashboard.en.yml
new file mode 100644
index 000000000..f0fd8d6ed
--- /dev/null
+++ b/config/locales/controllers/detsis/dashboard.en.yml
@@ -0,0 +1,7 @@
+en:
+ detsis:
+ dashboard:
+ index:
+ card_header: DETSIS References
+ card:
+ sdp_codes: SDP Codes
diff --git a/config/locales/controllers/detsis/dashboard.tr.yml b/config/locales/controllers/detsis/dashboard.tr.yml
new file mode 100644
index 000000000..74a9100f4
--- /dev/null
+++ b/config/locales/controllers/detsis/dashboard.tr.yml
@@ -0,0 +1,7 @@
+tr:
+ detsis:
+ dashboard:
+ index:
+ card_header: DETSİS Referansları
+ card:
+ sdp_codes: SDP Kodları
diff --git a/config/locales/controllers/detsis/sdp_codes.en.yml b/config/locales/controllers/detsis/sdp_codes.en.yml
new file mode 100644
index 000000000..b64bbeff1
--- /dev/null
+++ b/config/locales/controllers/detsis/sdp_codes.en.yml
@@ -0,0 +1,13 @@
+en:
+ detsis:
+ sdp_codes:
+ index:
+ card_header: SDP Codes
+ first: First code
+ full_code: Full code
+ main: Main Code
+ name: Name
+ second: Second code
+ third: Third code
+ search:
+ smart_search_placeholder: Search
diff --git a/config/locales/controllers/detsis/sdp_codes.tr.yml b/config/locales/controllers/detsis/sdp_codes.tr.yml
new file mode 100644
index 000000000..ef8164f35
--- /dev/null
+++ b/config/locales/controllers/detsis/sdp_codes.tr.yml
@@ -0,0 +1,13 @@
+tr:
+ detsis:
+ sdp_codes:
+ index:
+ card_header: SDP Kodları
+ first: Birinci kod
+ full_code: Tam kod
+ main: Ana kod
+ name: Adı
+ second: İkinci kod
+ third: Üçüncü kod
+ search:
+ smart_search_placeholder: Ara
diff --git a/config/locales/controllers/manager/dashboard.en.yml b/config/locales/controllers/manager/dashboard.en.yml
new file mode 100644
index 000000000..e66cd3f27
--- /dev/null
+++ b/config/locales/controllers/manager/dashboard.en.yml
@@ -0,0 +1,8 @@
+en:
+ manager:
+ dashboard:
+ stats:
+ more_information: More Information
+ academic_publishing: Academic Publishing
+ employee: Employee
+ student: Student
diff --git a/config/locales/controllers/manager/dashboard.tr.yml b/config/locales/controllers/manager/dashboard.tr.yml
new file mode 100644
index 000000000..7ab407162
--- /dev/null
+++ b/config/locales/controllers/manager/dashboard.tr.yml
@@ -0,0 +1,8 @@
+tr:
+ manager:
+ dashboard:
+ stats:
+ academic_publishing: Akademik Yayın
+ employee: Personel
+ more_information: Detaylı Bilgi
+ student: Öğrenci
diff --git a/config/locales/controllers/manager/stats/articles.en.yml b/config/locales/controllers/manager/stats/articles.en.yml
new file mode 100644
index 000000000..79039428b
--- /dev/null
+++ b/config/locales/controllers/manager/stats/articles.en.yml
@@ -0,0 +1,13 @@
+en:
+ manager:
+ stats:
+ articles:
+ index:
+ article: Article
+ number_of_articles_by_years: Number of Articles by Years
+ publications_by_index_types: Publications by Index Types
+ publications_by_language: Publications by Publication Language
+ publications_by_number_of_authors: Publications by Number of Authors
+ publications_by_publication_types: Publications by Publication Types
+ recently_added: Recently Added Articles
+ top_publishers: Top Publishing Academics
diff --git a/config/locales/controllers/manager/stats/articles.tr.yml b/config/locales/controllers/manager/stats/articles.tr.yml
new file mode 100644
index 000000000..1097d6b2a
--- /dev/null
+++ b/config/locales/controllers/manager/stats/articles.tr.yml
@@ -0,0 +1,13 @@
+tr:
+ manager:
+ stats:
+ articles:
+ index:
+ article: Makale
+ number_of_articles_by_years: Yıllara Göre Makale Sayısı
+ publications_by_index_types: Index Türüne Göre Makaleler
+ publications_by_language: Yayın Diline Göre Makaleler
+ publications_by_number_of_authors: Yazar Sayısına Göre Makaleler
+ publications_by_publication_types: Yayın Türüne Göre Makaleler
+ recently_added: En Son Eklenen Makaleler
+ top_publishers: En Çok Makalesi Olanlar
diff --git a/config/locales/controllers/manager/stats/employees.en.yml b/config/locales/controllers/manager/stats/employees.en.yml
new file mode 100644
index 000000000..6f8d98e65
--- /dev/null
+++ b/config/locales/controllers/manager/stats/employees.en.yml
@@ -0,0 +1,6 @@
+en:
+ manager:
+ stats:
+ employees:
+ academic:
+ title: Number of Academic Employee
diff --git a/config/locales/controllers/manager/stats/employees.tr.yml b/config/locales/controllers/manager/stats/employees.tr.yml
new file mode 100644
index 000000000..a3c8df8e0
--- /dev/null
+++ b/config/locales/controllers/manager/stats/employees.tr.yml
@@ -0,0 +1,6 @@
+tr:
+ manager:
+ stats:
+ employees:
+ academic:
+ title: Akademik Personel Sayıları
diff --git a/config/locales/controllers/manager/stats/students.en.yml b/config/locales/controllers/manager/stats/students.en.yml
new file mode 100644
index 000000000..d489c2f5b
--- /dev/null
+++ b/config/locales/controllers/manager/stats/students.en.yml
@@ -0,0 +1,21 @@
+en:
+ manager:
+ stats:
+ students:
+ cities:
+ female: Female
+ male: Male
+ title: Number of Students by Cities
+ total: Total
+ double_major_and_minor:
+ rate: Rate
+ title: Number of Students Studying in Double Major and Minor Programs
+ genders:
+ rate: Rate
+ title: Number of Student by Genders
+ genders_and_degrees:
+ title: Number of Students by Academic Degree and Gender
+ total_number_of_students: Total Number of Students
+ non_graduates:
+ total_number_of_students: Total Number of Students
+ title: Number of Students Not Graduate on Time by Academic Degree
diff --git a/config/locales/controllers/manager/stats/students.tr.yml b/config/locales/controllers/manager/stats/students.tr.yml
new file mode 100644
index 000000000..f23c8c696
--- /dev/null
+++ b/config/locales/controllers/manager/stats/students.tr.yml
@@ -0,0 +1,22 @@
+tr:
+ manager:
+ stats:
+ students:
+ cities:
+ female: Kadın
+ male: Erkek
+ title: Şehirlere Göre Öğrenci Sayıları
+ total: Toplam
+ double_major_and_minor:
+ rate: Oran
+ title: Çift Anadal ve Yandal Programlarında Öğrenim Gören Öğrenci Sayısı
+ genders:
+ rate: Oran
+ title: Cinsiyetlerine Göre Öğrenci Sayıları
+ genders_and_degrees:
+ title: Öğrenim Düzeylerine ve Cinsiyetlerine Göre Öğrenci Sayıları
+ total_number_of_students: Toplam Öğrenci Sayısı
+ non_graduates:
+ total_number_of_students: Toplam Öğrenci Sayısı
+ title: Öğrenim Düzeylerine Göre Zamanında Mezun Olamayan Öğrenci Sayıları
+
diff --git a/config/locales/controllers/studentship/course_enrollments.en.yml b/config/locales/controllers/studentship/course_enrollments.en.yml
index 87bb590ce..8892c20c4 100644
--- a/config/locales/controllers/studentship/course_enrollments.en.yml
+++ b/config/locales/controllers/studentship/course_enrollments.en.yml
@@ -15,6 +15,7 @@ en:
code: Code
credit: Credit
ects: ECTS
+ group: Group
name: Name
type: Type
add: Add
@@ -30,10 +31,11 @@ en:
errors:
already_enrolled_at_group: The maximum amount of ECTS that can be selected from the course group is selected.
empty_selected_courses_list: The list of selected courses is empty.
- quota_full: The course has reached its quota.
+ group_quota_full: The course group has reached its quota.
must_drop_first: Courses taken from the top semester must be dropped first.
not_enough_ects: The amount of ECTS that can be selected is not enough for you to take this course.
not_proper_register_event_range: There is no online course registration activity covering the date range today.
+ quota_full: The course has reached its quota.
registration_completed: You can not perform this action since you have completed the course selection.
index:
course_enrollments: Course Enrollments
@@ -47,6 +49,7 @@ en:
year: Year
new:
available_courses: Available Courses
+ courses_with_full_quota: There are courses reached its quota in your selected courses list. Please remove the course(s) indicated by the red button from your list.
save_enrollments: Save Enrollments
selectable_ects: Selectable ECTS
selected_courses: Selected Courses
diff --git a/config/locales/controllers/studentship/course_enrollments.tr.yml b/config/locales/controllers/studentship/course_enrollments.tr.yml
index 5916503a9..21e871b3c 100644
--- a/config/locales/controllers/studentship/course_enrollments.tr.yml
+++ b/config/locales/controllers/studentship/course_enrollments.tr.yml
@@ -15,6 +15,7 @@ tr:
code: Kodu
credit: Kredi
ects: AKTS
+ group: Grup
name: Adı
type: Türü
add: Ekle
@@ -30,10 +31,11 @@ tr:
errors:
already_enrolled_at_group: Ders grubundan seçilebilecek maksimum AKTS miktarı kadar ders seçilmiş.
empty_selected_courses_list: Seçilen dersler listesi boş.
- quota_full: Ders için belirlenen kontenjan dolmuş.
+ group_quota_full: Ders grubu için belirlenen kontenjan dolmuş.
must_drop_first: Öncelikli olarak en üst dönemden alınan dersler çıkarılmalı.
not_enough_ects: Seçilebilecek AKTS miktarı bu dersi alabilmeniz için yeterli değil.
not_proper_register_event_range: Tarih aralığı bugünü kapsayan çevrimiçi ders kayıtlanma aktivitesi bulunmamaktadır.
+ quota_full: Ders için belirlenen kontenjan dolmuş.
registration_completed: Ders seçimini tamamladığınız için bu işlemi gerçekleştiremezsiniz.
index:
course_enrollments: Ders Kayıtları
@@ -47,6 +49,7 @@ tr:
year: Yıl
new:
available_courses: Açılan Dersler
+ courses_with_full_quota: Seçilen dersler listenizde kotası dolmuş dersler bulunmaktadır. Lütfen kırmızı butonla belirtilen dersi/dersleri listenizden çıkarınız.
save_enrollments: Seçimleri Kaydet
selectable_ects: Seçilebilecek AKTS
selected_courses: Seçilen Dersler
diff --git a/config/locales/defaults/en.yml b/config/locales/defaults/en.yml
index 6a3f8b8f7..19abc7479 100644
--- a/config/locales/defaults/en.yml
+++ b/config/locales/defaults/en.yml
@@ -11,6 +11,7 @@ en:
actions: Actions
active: Active
are_you_sure: Are you sure?
+ toggle_auto_refresh: Toggle Automatic Refresh
created_at: Created At
detailed_search: Detailed Search
home_nav: Home
@@ -18,6 +19,7 @@ en:
loading: Loading... Please wait.
passive: Passive
preview: Preview
+ refresh: Refresh
reset: Reset
save: Save
search: Search
diff --git a/config/locales/defaults/tr.yml b/config/locales/defaults/tr.yml
index de4ae4384..e811ecc1f 100644
--- a/config/locales/defaults/tr.yml
+++ b/config/locales/defaults/tr.yml
@@ -11,6 +11,7 @@ tr:
actions: İşlemler
active: Aktif
are_you_sure: Emin misiniz?
+ toggle_auto_refresh: Otomatik Yenilemeyi Aç / Kapat
created_at: Oluşturulma Tarihi
detailed_search: Detaylı Arama
home_nav: Anasayfa
@@ -18,6 +19,7 @@ tr:
loading: Yükleniyor... Lütfen bekleyiniz.
passive: Pasif
preview: Ön İzleme
+ refresh: Yenile
reset: Sıfırla
save: Kaydet
search: Arama Yap
diff --git a/config/locales/layouts/mailer/en.yml b/config/locales/layouts/mailer/en.yml
index 06ed8aa3d..d04acff92 100644
--- a/config/locales/layouts/mailer/en.yml
+++ b/config/locales/layouts/mailer/en.yml
@@ -1,4 +1,4 @@
en:
layouts:
mailer:
- title: Nokul - University Otomation
+ title: Nokul - University Automation System
diff --git a/config/locales/layouts/shared/meta_en.yml b/config/locales/layouts/shared/meta.en.yml
similarity index 76%
rename from config/locales/layouts/shared/meta_en.yml
rename to config/locales/layouts/shared/meta.en.yml
index 8344be1cb..b7917e00b 100644
--- a/config/locales/layouts/shared/meta_en.yml
+++ b/config/locales/layouts/shared/meta.en.yml
@@ -4,4 +4,4 @@ en:
meta:
author: OMU - BAUM
description: Nokul, is a complete web application and automation for universities and students.
- title: Nokul - University Otomation
+ title: Nokul - University Automation System
diff --git a/config/locales/layouts/shared/meta_tr.yml b/config/locales/layouts/shared/meta.tr.yml
similarity index 100%
rename from config/locales/layouts/shared/meta_tr.yml
rename to config/locales/layouts/shared/meta.tr.yml
diff --git a/config/locales/layouts/shared/sidebar_en.yml b/config/locales/layouts/shared/sidebar.en.yml
similarity index 85%
rename from config/locales/layouts/shared/sidebar_en.yml
rename to config/locales/layouts/shared/sidebar.en.yml
index 2b3e9c9e2..f6be591c5 100644
--- a/config/locales/layouts/shared/sidebar_en.yml
+++ b/config/locales/layouts/shared/sidebar.en.yml
@@ -12,21 +12,24 @@ en:
calendars: Calendars
committee_units: Committee Units
committees: Committees
- courses: Courses
+ course_enrollments: Course Enrollments
course_groups: Course Unit Group
course_management: Course Management
- course_enrollments: Course Enrolments
course_unit_groups: Course Unit Group
+ courses: Courses
curriculums: Curriculums
+ detsis: DETSIS
first_registration: First Registration
high_school_types: High School Types
- ldap_sync: Ldap Sync
+ ldap: LDAP
+ manager:
+ stats: University Stats
+ title: Manager Pages
meksis: MEKSIS
prospective_employees: Prospective Employees
prospective_students: Prospective Students
references: References
registration_documents: Registration Documents
- studies: Academic Studies
units: Units
users: Users
yoksis: YOKSIS
diff --git a/config/locales/layouts/shared/sidebar_tr.yml b/config/locales/layouts/shared/sidebar.tr.yml
similarity index 87%
rename from config/locales/layouts/shared/sidebar_tr.yml
rename to config/locales/layouts/shared/sidebar.tr.yml
index 579474763..e93230d52 100644
--- a/config/locales/layouts/shared/sidebar_tr.yml
+++ b/config/locales/layouts/shared/sidebar.tr.yml
@@ -12,21 +12,24 @@ tr:
calendars: Takvimler
committee_units: Kurul ve Komisyonlar
committees: Kurullar/Komisyonlar
+ course_enrollments: Ders Kayıtları
course_groups: Ders Grupları
course_management: Ders İşlemleri
- course_enrollments: Ders Kayıtları
course_unit_groups: Ders Grupları
courses: Dersler
curriculums: Müfredatlar
+ detsis: DETSİS
first_registration: İlk Kayıt
high_school_types: Lise Türleri
- ldap_sync: Ldap Sync
+ ldap: LDAP
+ manager:
+ stats: Üniversite İstatistikleri
+ title: Yönetici Sayfaları
meksis: MEKSİS
prospective_employees: Aday Personeller
prospective_students: Aday Öğrenciler
references: Tanımlar
registration_documents: İstenen Belgeler
- studies: Akademik Çalışmalar
units: Birimler
users: Kullanıcılar
yoksis: YÖKSİS
diff --git a/config/locales/models/studies/en.yml b/config/locales/models/studies/en.yml
deleted file mode 100644
index 8148c047c..000000000
--- a/config/locales/models/studies/en.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-en:
- studies:
- articles:
- index:
- article: Article
- number_of_articles_by_years: Number of Articles by Years
- publications_by_index_types: Publications by Index Types
- publications_by_language: Publications by Publication Language
- publications_by_number_of_authors: Publications by Number of Authors
- publications_by_publication_types: Publications by Publication Types
- recently_added: Recently Added Articles
- top_publishers: Top Publishing Academics
- dashboard:
- index:
- articles: Articles
- certifications: Certifications
- projects: Projects
diff --git a/config/locales/models/studies/tr.yml b/config/locales/models/studies/tr.yml
deleted file mode 100644
index bed83b445..000000000
--- a/config/locales/models/studies/tr.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-tr:
- studies:
- articles:
- index:
- article: Makale
- number_of_articles_by_years: Yıllara Göre Makale Sayısı
- publications_by_index_types: Index Türüne Göre Makaleler
- publications_by_language: Yayın Dili Göre Makaleler
- publications_by_number_of_authors: Yazar Sayısına Göre Makaleler
- publications_by_publication_types: Yayın Türüne Göre Makaleler
- recently_added: En Son Eklenen Makaleler
- top_publishers: En Çok Makalesi Olanlar
- dashboard:
- index:
- articles: Makaleler
- certifications: Sertifikalar
- projects: Projeler
diff --git a/config/routes.rb b/config/routes.rb
index 7b0e1381f..7ec30fd3d 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -17,11 +17,13 @@
draw :course_management
draw :first_registration
draw :location
+ draw :manager
+ draw :meksis
draw :patron
draw :reference
draw :studentship
draw :yoksis
- draw :meksis
+ draw :detsis
resources :units do
member do
@@ -37,13 +39,6 @@
get 'save_identity_from_mernis', on: :member
end
- scope module: :studies do
- get '/studies', to: 'dashboard#index'
- get '/studies/articles', to: 'articles#index'
- get '/studies/projects', to: 'projects#index'
- get '/studies/certifications', to: 'certifications#index'
- end
-
resources :agenda_types, except: :show, module: :committee
resources :committees, only: :index, controller: 'committee/dashboard' do
diff --git a/config/routes/detsis.rb b/config/routes/detsis.rb
new file mode 100644
index 000000000..a11c2484a
--- /dev/null
+++ b/config/routes/detsis.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+namespace :detsis do
+ get '/', to: 'dashboard#index'
+
+ resources :sdp_codes, only: %i[index]
+end
diff --git a/config/routes/manager.rb b/config/routes/manager.rb
new file mode 100644
index 000000000..d3a41b1fa
--- /dev/null
+++ b/config/routes/manager.rb
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+namespace :manager do
+ get :stats, to: 'dashboard#stats'
+
+ scope module: :stats do
+ get 'articles', to: 'articles#index'
+ namespace :employees do
+ get '/', action: :index
+ get :academic
+ end
+ namespace :students do
+ get '/', action: :index
+ get :cities
+ get :double_major_and_minor
+ get :genders
+ get :genders_and_degrees
+ get :non_graduates
+ end
+ end
+end
diff --git a/db/migrate/20200122124332_create_sdp_codes.rb b/db/migrate/20200122124332_create_sdp_codes.rb
new file mode 100644
index 000000000..37bc7a85d
--- /dev/null
+++ b/db/migrate/20200122124332_create_sdp_codes.rb
@@ -0,0 +1,28 @@
+class CreateSdpCodes < ActiveRecord::Migration[6.0]
+ def change
+ create_table :sdp_codes do |t|
+ t.integer :main
+ t.integer :first
+ t.integer :second
+ t.integer :third
+ t.string :name
+
+ t.timestamps
+ end
+
+ add_presence_constraint :sdp_codes, :name
+
+ add_null_constraint :sdp_codes, :main
+ add_null_constraint :sdp_codes, :first
+ add_null_constraint :sdp_codes, :second
+ add_null_constraint :sdp_codes, :third
+ add_null_constraint :sdp_codes, :name
+
+ add_numericality_constraint :sdp_codes, :main, greater_than_or_equal_to: 0
+ add_numericality_constraint :sdp_codes, :first, greater_than_or_equal_to: 0
+ add_numericality_constraint :sdp_codes, :second, greater_than_or_equal_to: 0
+ add_numericality_constraint :sdp_codes, :third, greater_than_or_equal_to: 0
+
+ add_length_constraint :sdp_codes, :name, less_than_or_equal_to: 255
+ end
+end
diff --git a/db/migrate/20200123164837_available_course_group_reference_to_course_enrollments.rb b/db/migrate/20200123164837_available_course_group_reference_to_course_enrollments.rb
new file mode 100644
index 000000000..74d38112b
--- /dev/null
+++ b/db/migrate/20200123164837_available_course_group_reference_to_course_enrollments.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AvailableCourseGroupReferenceToCourseEnrollments < ActiveRecord::Migration[6.0]
+ def change
+ add_reference :course_enrollments, :available_course_group, foreign_key: true
+ end
+end
diff --git a/db/structure.sql b/db/structure.sql
index c3461ba29..249caecf5 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -1247,6 +1247,7 @@ CREATE TABLE public.course_enrollments (
created_at timestamp(6) without time zone NOT NULL,
updated_at timestamp(6) without time zone NOT NULL,
semester_registration_id bigint,
+ available_course_group_id bigint,
CONSTRAINT course_enrollments_status_numericality CHECK ((status >= 0))
);
@@ -2855,6 +2856,52 @@ CREATE SEQUENCE public.scope_assignments_id_seq
ALTER SEQUENCE public.scope_assignments_id_seq OWNED BY public.scope_assignments.id;
+--
+-- Name: sdp_codes; Type: TABLE; Schema: public; Owner: -
+--
+
+CREATE TABLE public.sdp_codes (
+ id bigint NOT NULL,
+ main integer,
+ first integer,
+ second integer,
+ third integer,
+ name character varying,
+ created_at timestamp(6) without time zone NOT NULL,
+ updated_at timestamp(6) without time zone NOT NULL,
+ CONSTRAINT sdp_codes_first_null CHECK ((first IS NOT NULL)),
+ CONSTRAINT sdp_codes_first_numericality CHECK ((first >= 0)),
+ CONSTRAINT sdp_codes_main_null CHECK ((main IS NOT NULL)),
+ CONSTRAINT sdp_codes_main_numericality CHECK ((main >= 0)),
+ CONSTRAINT sdp_codes_name_length CHECK ((length((name)::text) <= 255)),
+ CONSTRAINT sdp_codes_name_null CHECK ((name IS NOT NULL)),
+ CONSTRAINT sdp_codes_name_presence CHECK (((name IS NOT NULL) AND ((name)::text !~ '^\s*$'::text))),
+ CONSTRAINT sdp_codes_second_null CHECK ((second IS NOT NULL)),
+ CONSTRAINT sdp_codes_second_numericality CHECK ((second >= 0)),
+ CONSTRAINT sdp_codes_third_null CHECK ((third IS NOT NULL)),
+ CONSTRAINT sdp_codes_third_numericality CHECK ((third >= 0))
+);
+
+
+--
+-- Name: sdp_codes_id_seq; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE public.sdp_codes_id_seq
+ START WITH 1
+ INCREMENT BY 1
+ NO MINVALUE
+ NO MAXVALUE
+ CACHE 1;
+
+
+--
+-- Name: sdp_codes_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: -
+--
+
+ALTER SEQUENCE public.sdp_codes_id_seq OWNED BY public.sdp_codes.id;
+
+
--
-- Name: semester_registrations; Type: TABLE; Schema: public; Owner: -
--
@@ -4077,6 +4124,13 @@ ALTER TABLE ONLY public.roles ALTER COLUMN id SET DEFAULT nextval('public.roles_
ALTER TABLE ONLY public.scope_assignments ALTER COLUMN id SET DEFAULT nextval('public.scope_assignments_id_seq'::regclass);
+--
+-- Name: sdp_codes id; Type: DEFAULT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY public.sdp_codes ALTER COLUMN id SET DEFAULT nextval('public.sdp_codes_id_seq'::regclass);
+
+
--
-- Name: semester_registrations id; Type: DEFAULT; Schema: public; Owner: -
--
@@ -4881,6 +4935,14 @@ ALTER TABLE ONLY public.scope_assignments
ADD CONSTRAINT scope_assignments_pkey PRIMARY KEY (id);
+--
+-- Name: sdp_codes sdp_codes_pkey; Type: CONSTRAINT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY public.sdp_codes
+ ADD CONSTRAINT sdp_codes_pkey PRIMARY KEY (id);
+
+
--
-- Name: semester_registrations semester_registrations_pkey; Type: CONSTRAINT; Schema: public; Owner: -
--
@@ -5517,6 +5579,13 @@ CREATE INDEX index_course_assessment_methods_on_assessment_method_id ON public.c
CREATE INDEX index_course_assessment_methods_on_course_evaluation_type_id ON public.course_assessment_methods USING btree (course_evaluation_type_id);
+--
+-- Name: index_course_enrollments_on_available_course_group_id; Type: INDEX; Schema: public; Owner: -
+--
+
+CREATE INDEX index_course_enrollments_on_available_course_group_id ON public.course_enrollments USING btree (available_course_group_id);
+
+
--
-- Name: index_course_enrollments_on_available_course_id; Type: INDEX; Schema: public; Owner: -
--
@@ -6180,6 +6249,14 @@ ALTER TABLE ONLY public.curriculum_semesters
ADD CONSTRAINT fk_rails_32e14f7893 FOREIGN KEY (curriculum_id) REFERENCES public.curriculums(id);
+--
+-- Name: course_enrollments fk_rails_32f6a8ca4e; Type: FK CONSTRAINT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY public.course_enrollments
+ ADD CONSTRAINT fk_rails_32f6a8ca4e FOREIGN KEY (available_course_group_id) REFERENCES public.available_course_groups(id);
+
+
--
-- Name: curriculum_programs fk_rails_33195b0adb; Type: FK CONSTRAINT; Schema: public; Owner: -
--
@@ -6983,6 +7060,8 @@ INSERT INTO "schema_migrations" (version) VALUES
('20191127055945'),
('20191226074849'),
('20200102083531'),
-('20200102083736');
+('20200102083736'),
+('20200122124332'),
+('20200123164837');
diff --git a/lib/tasks/fetch/sdp_code_references.rake b/lib/tasks/fetch/sdp_code_references.rake
new file mode 100644
index 000000000..d0f7a15bf
--- /dev/null
+++ b/lib/tasks/fetch/sdp_code_references.rake
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+namespace :fetch do
+ desc 'Fetch SDP code references from Detsis'
+ task sdp_code_references: :environment do
+ sdp_codes = Xokul::Detsis.sdp_code_references
+ progress_bar = ProgressBar.spawn 'Detsis - SDP code references', sdp_codes.size
+
+ sdp_codes.each do |code|
+ record = SdpCode.find_or_initialize_by(**code)
+ record.assign_attributes(**code)
+ record.save
+
+ progress_bar&.increment
+ end
+ end
+end
diff --git a/package.json b/package.json
index 477646017..54df6b22f 100644
--- a/package.json
+++ b/package.json
@@ -9,15 +9,19 @@
"@rails/ujs": "^6.0.1",
"@rails/webpacker": "4.2.2",
"chalk": "^3.0.0",
+ "echarts": "^4.5.0",
"flatpickr": "^4.6.3",
+ "highcharts": "^7.2.1",
"intl-tel-input": "^16.0.8",
"jquery.maskedinput": "^1.4.1",
"select2": "^4.0.12",
+ "stimulus": "^1.1.1",
"toastr": "^2.1.4",
"trix": "^1.2.2",
"turbolinks": "^5.2.0"
},
"devDependencies": {
+ "babel-eslint": "^10.0.3",
"eslint": "^6.7.2",
"eslint-config-standard": "^14.1.0",
"eslint-plugin-import": "^2.16.0",
@@ -25,11 +29,11 @@
"eslint-plugin-promise": "^4.0.1",
"eslint-plugin-standard": "^4.0.0",
"htmlhint": "^0.11.0",
- "markdownlint-cli": "^0.19.0",
+ "markdownlint-cli": "^0.21.0",
"webpack-dev-server": "^3.9.0"
},
"scripts": {
- "lint": "eslint ./app/assets --color",
- "lint-fix": "eslint ./app/assets --color --fix"
+ "lint": "eslint ./app/assets ./app/javascript --color",
+ "lint-fix": "eslint ./app/assets ./app/javascript --color --fix"
}
}
diff --git a/test/controllers/detsis/dashboard_controller_test.rb b/test/controllers/detsis/dashboard_controller_test.rb
new file mode 100644
index 000000000..b8be901dd
--- /dev/null
+++ b/test/controllers/detsis/dashboard_controller_test.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require 'test_helper'
+
+module Detsis
+ class DashboardControllerTest < ActionDispatch::IntegrationTest
+ setup do
+ sign_in users(:john)
+ end
+
+ test 'should get index' do
+ get detsis_path
+
+ assert_response :success
+ assert_equal 'index', @controller.action_name
+ end
+ end
+end
diff --git a/test/controllers/detsis/sdp_codes_controller_test.rb b/test/controllers/detsis/sdp_codes_controller_test.rb
new file mode 100644
index 000000000..98931c9b0
--- /dev/null
+++ b/test/controllers/detsis/sdp_codes_controller_test.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require 'test_helper'
+
+module Detsis
+ class SdpCodesControllerTest < ActionDispatch::IntegrationTest
+ setup do
+ sign_in users(:john)
+ end
+
+ test 'should get index' do
+ get detsis_sdp_codes_path
+
+ assert_response :success
+ assert_equal 'index', @controller.action_name
+ assert_select '#collapseSearch', t('smart_search')
+ end
+ end
+end
diff --git a/test/controllers/studentship/course_enrollments_controller_test.rb b/test/controllers/studentship/course_enrollments_controller_test.rb
index 2ad98c64a..cb2c2fabe 100644
--- a/test/controllers/studentship/course_enrollments_controller_test.rb
+++ b/test/controllers/studentship/course_enrollments_controller_test.rb
@@ -22,7 +22,10 @@ class CourseEnrollmentsControllerTest < ActionDispatch::IntegrationTest
test 'should create course_enrollment' do
assert_difference('CourseEnrollment.count') do
post student_course_enrollments_path(@student), params: {
- course_enrollment: { available_course_id: available_courses(:compulsory_course_2).id }
+ course_enrollment: {
+ available_course_id: available_courses(:compulsory_course_2).id,
+ available_course_group_id: available_course_groups(:compulsory_course_2_group).id
+ }
}
end
@@ -34,6 +37,7 @@ class CourseEnrollmentsControllerTest < ActionDispatch::IntegrationTest
end
test 'should save' do
+ delete student_course_enrollment_path(@student, course_enrollments(:elective))
get save_student_course_enrollments_path(@student)
assert @student.current_registration.saved?
assert_redirected_to list_student_course_enrollments_path
diff --git a/test/fixtures/available_course_groups.yml b/test/fixtures/available_course_groups.yml
index be9cf0a97..e6a9f4d87 100644
--- a/test/fixtures/available_course_groups.yml
+++ b/test/fixtures/available_course_groups.yml
@@ -10,10 +10,18 @@ course_group_to_delete:
available_course: ati_fall_2018_2019
name: Group 3
quota: 100
+old_course_group:
+ available_course: old_course
+ name: Group 1
+ quota: 1
elective_course_group:
available_course: elective_course
name: Group 1
quota: 1
+elective_course_group_2:
+ available_course: elective_course
+ name: Group 2
+ quota: 10
elective_course_2_group:
available_course: elective_course_2
name: Group 1
diff --git a/test/fixtures/available_course_lecturers.yml b/test/fixtures/available_course_lecturers.yml
index 7c2928fa5..6418876bf 100644
--- a/test/fixtures/available_course_lecturers.yml
+++ b/test/fixtures/available_course_lecturers.yml
@@ -6,3 +6,27 @@ ati_group_1_lecturer_serhat:
group: ati_group_1
lecturer: serhat_active
coordinator: false
+elective_course_group_lecturer:
+ group: elective_course_group
+ lecturer: serhat_active
+ coordinator: true
+elective_course_group_2_lecturer:
+ group: elective_course_group_2
+ lecturer: serhat_active
+ coordinator: true
+elective_course_2_group_lecturer:
+ group: elective_course_2_group
+ lecturer: serhat_active
+ coordinator: true
+elective_course_2_group_lecturer:
+ group: elective_course_group
+ lecturer: serhat_active
+ coordinator: true
+compulsory_course_group_lecturer:
+ group: compulsory_course_group
+ lecturer: serhat_active
+ coordinator: true
+compulsory_course_2_group_lecturer:
+ group: compulsory_course_2_group
+ lecturer: serhat_active
+ coordinator: true
diff --git a/test/fixtures/course_enrollments.yml b/test/fixtures/course_enrollments.yml
index 33b460927..2f451c4f6 100644
--- a/test/fixtures/course_enrollments.yml
+++ b/test/fixtures/course_enrollments.yml
@@ -1,19 +1,23 @@
old:
semester_registration: serhat_first_semester
available_course: test_fall_2018_2019
- status: saved
-elective:
- semester_registration: serhat_third_semester
- available_course: elective_course
+ available_course_group: ati_group_1
status: saved
failed:
semester_registration: serhat_first_semester
available_course: old_course
+ available_course_group: old_course_group
status: saved
+elective:
+ semester_registration: serhat_third_semester
+ available_course: elective_course
+ available_course_group: elective_course_group
compulsory:
semester_registration: serhat_third_semester
available_course: compulsory_course
+ available_course_group: compulsory_course_group
johns_enrollment:
semester_registration: john_third_semester
- available_course: compulsory_course
- status: saved
\ No newline at end of file
+ available_course: elective_course
+ available_course_group: elective_course_group
+ status: saved
diff --git a/test/fixtures/sdp_codes.yml b/test/fixtures/sdp_codes.yml
new file mode 100644
index 000000000..14e735cf2
--- /dev/null
+++ b/test/fixtures/sdp_codes.yml
@@ -0,0 +1,13 @@
+one:
+ main: 10
+ first: 1
+ second: 99
+ third: 5
+ name: GENEL
+
+two:
+ main: 45
+ first: 99
+ second: 0
+ third: 10
+ name: DİĞER
diff --git a/test/fixtures/semester_registrations.yml b/test/fixtures/semester_registrations.yml
index 64cfa78b8..8af49cba5 100644
--- a/test/fixtures/semester_registrations.yml
+++ b/test/fixtures/semester_registrations.yml
@@ -2,6 +2,7 @@ serhat_first_semester:
academic_term: summer_2018_2019
semester: 1
student: serhat
+ status: saved
serhat_third_semester:
academic_term: active_term
semester: 3
@@ -9,4 +10,5 @@ serhat_third_semester:
john_third_semester:
academic_term: active_term
semester: 3
- student: john
\ No newline at end of file
+ student: john
+ status: saved
diff --git a/test/models/available_course_group_test.rb b/test/models/available_course_group_test.rb
index 5374628d8..a65b9192e 100644
--- a/test/models/available_course_group_test.rb
+++ b/test/models/available_course_group_test.rb
@@ -8,6 +8,7 @@ class AvailableCourseGroupTest < ActiveSupport::TestCase
# relations
belongs_to :available_course, counter_cache: :groups_count
+ has_many :course_enrollments, dependent: :destroy
has_many :lecturers, class_name: 'AvailableCourseLecturer',
foreign_key: :group_id,
inverse_of: :group,
@@ -24,4 +25,10 @@ class AvailableCourseGroupTest < ActiveSupport::TestCase
# validations: nested models
validates_presence_of_nested_model :lecturers
+
+ # custom methods
+ test 'quota_full? method' do
+ assert available_course_groups(:elective_course_group).quota_full?
+ assert_not available_course_groups(:elective_course_2_group).quota_full?
+ end
end
diff --git a/test/models/available_course_test.rb b/test/models/available_course_test.rb
index 767913032..3d6fc4047 100644
--- a/test/models/available_course_test.rb
+++ b/test/models/available_course_test.rb
@@ -46,7 +46,13 @@ class AvailableCourseTest < ActiveSupport::TestCase
# custom methods
test 'quota_full? method' do
- assert available_courses(:elective_course).quota_full?
- assert_not available_courses(:compulsory_course).quota_full?
+ assert available_courses(:old_course).quota_full?
+ assert_not available_courses(:elective_course).quota_full?
+ end
+
+ test 'enrollable_groups method' do
+ enrollable_groups = available_courses(:elective_course).enrollable_groups
+ assert_includes enrollable_groups, available_course_groups(:elective_course_group_2)
+ assert_not_includes enrollable_groups, available_course_groups(:elective_course_group)
end
end
diff --git a/test/models/course_enrollment_test.rb b/test/models/course_enrollment_test.rb
index 927f3e497..ab53b6a14 100644
--- a/test/models/course_enrollment_test.rb
+++ b/test/models/course_enrollment_test.rb
@@ -12,6 +12,7 @@ class CourseEnrollmentTest < ActiveSupport::TestCase
# relations
belongs_to :available_course
+ belongs_to :available_course_group
belongs_to :semester_registration
# validations: uniqueness
diff --git a/test/models/sdp_code_test.rb b/test/models/sdp_code_test.rb
new file mode 100644
index 000000000..b22a4d3da
--- /dev/null
+++ b/test/models/sdp_code_test.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+require 'test_helper'
+
+class SdpCodeTest < ActiveSupport::TestCase
+ test 'full_code must return the full of standardized sdp code' do
+ sdp_code_one = sdp_codes(:one)
+ sdp_code_two = sdp_codes(:two)
+
+ assert_equal sdp_code_one.full_code, '010.01.99'
+ assert_equal sdp_code_two.full_code, '045.99.00'
+ end
+end
diff --git a/test/services/student_course_enrollment_service_test.rb b/test/services/student_course_enrollment_service_test.rb
index 452ad47de..6212f8fe9 100644
--- a/test/services/student_course_enrollment_service_test.rb
+++ b/test/services/student_course_enrollment_service_test.rb
@@ -33,7 +33,7 @@ class StudentCourseEnrollmentServiceTest < ActiveSupport::TestCase
test 'enroll method' do
available_course = available_courses(:compulsory_course_2)
- @service.enroll(available_course_id: available_course.id)
+ @service.enroll(available_course_id: available_course.id, available_course_group: available_course.groups.first)
assert_includes @service.course_enrollments.pluck(:available_course_id), available_course.id
end
@@ -43,7 +43,8 @@ class StudentCourseEnrollmentServiceTest < ActiveSupport::TestCase
end
test 'save method' do
- @service.save
+ @service.drop(course_enrollments(:elective))
+ assert @service.save
assert @service.student.current_registration.saved?
end
@@ -75,6 +76,15 @@ class StudentCourseEnrollmentServiceTest < ActiveSupport::TestCase
assert_equal available_course.errors.full_messages.first, translate('must_drop_first')
end
+ test 'savable? method with false return' do
+ assert_not @service.savable?
+ end
+
+ test 'savable? method' do
+ @service.drop(course_enrollments(:elective))
+ assert @service.savable?
+ end
+
private
def translate(key, params = {})
diff --git a/yarn.lock b/yarn.lock
index a49828073..899fa8b15 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9,6 +9,13 @@
dependencies:
"@babel/highlight" "^7.0.0"
+"@babel/code-frame@^7.8.3":
+ version "7.8.3"
+ resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.8.3.tgz#33e25903d7481181534e12ec0a25f16b6fcf419e"
+ integrity sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==
+ dependencies:
+ "@babel/highlight" "^7.8.3"
+
"@babel/core@^7.7.2":
version "7.7.7"
resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.7.7.tgz#ee155d2e12300bcc0cff6a8ad46f2af5063803e9"
@@ -39,6 +46,16 @@
lodash "^4.17.13"
source-map "^0.5.0"
+"@babel/generator@^7.8.3":
+ version "7.8.3"
+ resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.8.3.tgz#0e22c005b0a94c1c74eafe19ef78ce53a4d45c03"
+ integrity sha512-WjoPk8hRpDRqqzRpvaR8/gDUPkrnOOeuT2m8cNICJtZH6mwaCo3v0OKMI7Y6SM1pBtyijnLtAL0HDi41pf41ug==
+ dependencies:
+ "@babel/types" "^7.8.3"
+ jsesc "^2.5.1"
+ lodash "^4.17.13"
+ source-map "^0.5.0"
+
"@babel/helper-annotate-as-pure@^7.7.4":
version "7.7.4"
resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.7.4.tgz#bb3faf1e74b74bd547e867e48f551fa6b098b6ce"
@@ -109,6 +126,15 @@
"@babel/template" "^7.7.4"
"@babel/types" "^7.7.4"
+"@babel/helper-function-name@^7.8.3":
+ version "7.8.3"
+ resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.8.3.tgz#eeeb665a01b1f11068e9fb86ad56a1cb1a824cca"
+ integrity sha512-BCxgX1BC2hD/oBlIFUgOCQDOPV8nSINxCwM3o93xP4P9Fq6aV5sgv2cOOITDMtCfQ+3PvHp3l689XZvAM9QyOA==
+ dependencies:
+ "@babel/helper-get-function-arity" "^7.8.3"
+ "@babel/template" "^7.8.3"
+ "@babel/types" "^7.8.3"
+
"@babel/helper-get-function-arity@^7.7.4":
version "7.7.4"
resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.7.4.tgz#cb46348d2f8808e632f0ab048172130e636005f0"
@@ -116,6 +142,13 @@
dependencies:
"@babel/types" "^7.7.4"
+"@babel/helper-get-function-arity@^7.8.3":
+ version "7.8.3"
+ resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.8.3.tgz#b894b947bd004381ce63ea1db9f08547e920abd5"
+ integrity sha512-FVDR+Gd9iLjUMY1fzE2SR0IuaJToR4RkCDARVfsBBPSP53GEqSFjD8gNyxg246VUyc/ALRxFaAK8rVG7UT7xRA==
+ dependencies:
+ "@babel/types" "^7.8.3"
+
"@babel/helper-hoist-variables@^7.7.4":
version "7.7.4"
resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.7.4.tgz#612384e3d823fdfaaf9fce31550fe5d4db0f3d12"
@@ -204,6 +237,13 @@
dependencies:
"@babel/types" "^7.7.4"
+"@babel/helper-split-export-declaration@^7.8.3":
+ version "7.8.3"
+ resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.8.3.tgz#31a9f30070f91368a7182cf05f831781065fc7a9"
+ integrity sha512-3x3yOeyBhW851hroze7ElzdkeRXQYQbFIb7gLK1WQYsw2GWDay5gAJNw1sWJ0VFP6z5J1whqeXH/WCdCjZv6dA==
+ dependencies:
+ "@babel/types" "^7.8.3"
+
"@babel/helper-wrap-function@^7.7.4":
version "7.7.4"
resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.7.4.tgz#37ab7fed5150e22d9d7266e830072c0cdd8baace"
@@ -232,6 +272,20 @@
esutils "^2.0.2"
js-tokens "^4.0.0"
+"@babel/highlight@^7.8.3":
+ version "7.8.3"
+ resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.8.3.tgz#28f173d04223eaaa59bc1d439a3836e6d1265797"
+ integrity sha512-PX4y5xQUvy0fnEVHrYOarRPXVWafSjTW9T0Hab8gVIawpl2Sj0ORyrygANq+KjcNlSSTw0YCLSNA8OyZ1I4yEg==
+ dependencies:
+ chalk "^2.0.0"
+ esutils "^2.0.2"
+ js-tokens "^4.0.0"
+
+"@babel/parser@^7.0.0", "@babel/parser@^7.8.3":
+ version "7.8.3"
+ resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.8.3.tgz#790874091d2001c9be6ec426c2eed47bc7679081"
+ integrity sha512-/V72F4Yp/qmHaTALizEm9Gf2eQHV3QyTL3K0cNfijwnMnb1L+LDlAubb/ZnSdGAVzVSWakujHYs1I26x66sMeQ==
+
"@babel/parser@^7.7.4", "@babel/parser@^7.7.7":
version "7.7.7"
resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.7.7.tgz#1b886595419cf92d811316d5b715a53ff38b4937"
@@ -663,6 +717,30 @@
"@babel/parser" "^7.7.4"
"@babel/types" "^7.7.4"
+"@babel/template@^7.8.3":
+ version "7.8.3"
+ resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.8.3.tgz#e02ad04fe262a657809327f578056ca15fd4d1b8"
+ integrity sha512-04m87AcQgAFdvuoyiQ2kgELr2tV8B4fP/xJAVUL3Yb3bkNdMedD3d0rlSQr3PegP0cms3eHjl1F7PWlvWbU8FQ==
+ dependencies:
+ "@babel/code-frame" "^7.8.3"
+ "@babel/parser" "^7.8.3"
+ "@babel/types" "^7.8.3"
+
+"@babel/traverse@^7.0.0":
+ version "7.8.3"
+ resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.8.3.tgz#a826215b011c9b4f73f3a893afbc05151358bf9a"
+ integrity sha512-we+a2lti+eEImHmEXp7bM9cTxGzxPmBiVJlLVD+FuuQMeeO7RaDbutbgeheDkw+Xe3mCfJHnGOWLswT74m2IPg==
+ dependencies:
+ "@babel/code-frame" "^7.8.3"
+ "@babel/generator" "^7.8.3"
+ "@babel/helper-function-name" "^7.8.3"
+ "@babel/helper-split-export-declaration" "^7.8.3"
+ "@babel/parser" "^7.8.3"
+ "@babel/types" "^7.8.3"
+ debug "^4.1.0"
+ globals "^11.1.0"
+ lodash "^4.17.13"
+
"@babel/traverse@^7.7.4":
version "7.7.4"
resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.7.4.tgz#9c1e7c60fb679fe4fcfaa42500833333c2058558"
@@ -678,6 +756,15 @@
globals "^11.1.0"
lodash "^4.17.13"
+"@babel/types@^7.0.0", "@babel/types@^7.8.3":
+ version "7.8.3"
+ resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.8.3.tgz#5a383dffa5416db1b73dedffd311ffd0788fb31c"
+ integrity sha512-jBD+G8+LWpMBBWvVcdr4QysjUE4mU/syrhN17o1u3gx0/WzJB1kwiVZAXRtWbsIPOwW8pF/YJV5+nmetPzepXg==
+ dependencies:
+ esutils "^2.0.2"
+ lodash "^4.17.13"
+ to-fast-properties "^2.0.0"
+
"@babel/types@^7.7.4":
version "7.7.4"
resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.7.4.tgz#516570d539e44ddf308c07569c258ff94fde9193"
@@ -806,6 +893,30 @@
webpack-cli "^3.3.10"
webpack-sources "^1.4.3"
+"@stimulus/core@^1.1.1":
+ version "1.1.1"
+ resolved "https://registry.yarnpkg.com/@stimulus/core/-/core-1.1.1.tgz#42b0cfe5b73ca492f41de64b77a03980bae92c82"
+ integrity sha512-PVJv7IpuQx0MVPCBblXc6O2zbCmU8dlxXNH4bC9KK6LsvGaE+PCXXrXQfXUwAsse1/CmRu/iQG7Ov58himjiGg==
+ dependencies:
+ "@stimulus/mutation-observers" "^1.1.1"
+
+"@stimulus/multimap@^1.1.1":
+ version "1.1.1"
+ resolved "https://registry.yarnpkg.com/@stimulus/multimap/-/multimap-1.1.1.tgz#b95e3fd607345ab36e5d5b55486ee1a12d56b331"
+ integrity sha512-26R1fI3a8uUj0WlMmta4qcfIQGlagegdP4PTz6lz852q/dXlG6r+uPS/bx+H8GtfyS+OOXVr3SkZ0Zg0iRqRfQ==
+
+"@stimulus/mutation-observers@^1.1.1":
+ version "1.1.1"
+ resolved "https://registry.yarnpkg.com/@stimulus/mutation-observers/-/mutation-observers-1.1.1.tgz#0f6c6f081308427fed2a26360dda0c173b79cfc0"
+ integrity sha512-/zCnnw1KJlWO2mrx0yxYaRFZWMGnDMdOgSnI4hxDLxdWVuL2HMROU8FpHWVBLjKY3T9A+lGkcrmPGDHF3pfS9w==
+ dependencies:
+ "@stimulus/multimap" "^1.1.1"
+
+"@stimulus/webpack-helpers@^1.1.1":
+ version "1.1.1"
+ resolved "https://registry.yarnpkg.com/@stimulus/webpack-helpers/-/webpack-helpers-1.1.1.tgz#eff60cd4e58b921d1a2764dc5215f5141510f2c2"
+ integrity sha512-XOkqSw53N9072FLHvpLM25PIwy+ndkSSbnTtjKuyzsv8K5yfkFB2rv68jU1pzqYa9FZLcvZWP4yazC0V38dx9A==
+
"@types/color-name@^1.1.1":
version "1.1.1"
resolved "https://registry.yarnpkg.com/@types/color-name/-/color-name-1.1.1.tgz#1c1261bbeaa10a8055bbc5d8ab84b7b2afc846a0"
@@ -1047,17 +1158,7 @@ ajv-keywords@^3.1.0, ajv-keywords@^3.4.1:
resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.4.1.tgz#ef916e271c64ac12171fd8384eaae6b2345854da"
integrity sha512-RO1ibKvd27e6FEShVFfPALuHI3WjSVNeK5FIsmme/LYRNxjKuNj+Dt7bucLa6NdSv3JcVTyMlm9kGR84z1XpaQ==
-ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2:
- version "6.10.2"
- resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.10.2.tgz#d3cea04d6b017b2894ad69040fec8b623eb4bd52"
- integrity sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==
- dependencies:
- fast-deep-equal "^2.0.1"
- fast-json-stable-stringify "^2.0.0"
- json-schema-traverse "^0.4.1"
- uri-js "^4.2.2"
-
-ajv@^6.5.5:
+ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.5.5:
version "6.11.0"
resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.11.0.tgz#c3607cbc8ae392d8a5a536f25b21f8e5f3f87fe9"
integrity sha512-nCprB/0syFYy9fVYU1ox1l2KN8S9I+tziH8D4zdZuLT3N6RMlGSGt5FSTpAiHB/Whv8Qs1cWHma1aMKZyaHRKA==
@@ -1327,6 +1428,18 @@ aws4@^1.8.0:
resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.9.1.tgz#7e33d8f7d449b3f673cd72deb9abdc552dbe528e"
integrity sha512-wMHVg2EOHaMRxbzgFJ9gtjOOCrI80OHLG14rxi28XwOW8ux6IiEbRCGGGqCtdAIg4FQCbW20k9RsT4y3gJlFug==
+babel-eslint@^10.0.3:
+ version "10.0.3"
+ resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-10.0.3.tgz#81a2c669be0f205e19462fed2482d33e4687a88a"
+ integrity sha512-z3U7eMY6r/3f3/JB9mTsLjyxrv0Yb1zb8PCWCLpguxfCzBIZUwy23R1t/XKewP+8mEN2Ck8Dtr4q20z6ce6SoA==
+ dependencies:
+ "@babel/code-frame" "^7.0.0"
+ "@babel/parser" "^7.0.0"
+ "@babel/traverse" "^7.0.0"
+ "@babel/types" "^7.0.0"
+ eslint-visitor-keys "^1.0.0"
+ resolve "^1.12.0"
+
babel-loader@^8.0.6:
version "8.0.6"
resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.0.6.tgz#e33bdb6f362b03f4bb141a0c21ab87c501b70dfb"
@@ -1548,14 +1661,14 @@ browserify-zlib@^0.2.0:
dependencies:
pako "~1.0.5"
-browserslist@^4.0.0, browserslist@^4.6.0, browserslist@^4.6.4, browserslist@^4.8.0, browserslist@^4.8.2:
- version "4.8.2"
- resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.8.2.tgz#b45720ad5fbc8713b7253c20766f701c9a694289"
- integrity sha512-+M4oeaTplPm/f1pXDw84YohEv7B1i/2Aisei8s4s6k3QsoSHa7i5sz8u/cGQkkatCPxMASKxPualR4wwYgVboA==
+browserslist@^4.0.0, browserslist@^4.6.0, browserslist@^4.6.4, browserslist@^4.8.0, browserslist@^4.8.3:
+ version "4.8.5"
+ resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.8.5.tgz#691af4e327ac877b25e7a3f7ee869c4ef36cdea3"
+ integrity sha512-4LMHuicxkabIB+n9874jZX/az1IaZ5a+EUuvD7KFOu9x/Bd5YHyO0DIz2ls/Kl8g0ItS4X/ilEgf4T1Br0lgSg==
dependencies:
- caniuse-lite "^1.0.30001015"
- electron-to-chromium "^1.3.322"
- node-releases "^1.1.42"
+ caniuse-lite "^1.0.30001022"
+ electron-to-chromium "^1.3.338"
+ node-releases "^1.1.46"
buffer-from@^1.0.0:
version "1.1.1"
@@ -1713,11 +1826,16 @@ caniuse-api@^3.0.0:
lodash.memoize "^4.1.2"
lodash.uniq "^4.5.0"
-caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001012, caniuse-lite@^1.0.30001015:
+caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001012:
version "1.0.30001016"
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001016.tgz#16ea48d7d6e8caf3cad3295c2d746fe38c4e7f66"
integrity sha512-yYQ2QfotceRiH4U+h1Us86WJXtVHDmy3nEKIdYPsZCYnOV5/tMgGbmoIlrMzmh2VXlproqYtVaKeGDBkMZifFA==
+caniuse-lite@^1.0.30001022:
+ version "1.0.30001023"
+ resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001023.tgz#b82155827f3f5009077bdd2df3d8968bcbcc6fc4"
+ integrity sha512-C5TDMiYG11EOhVOA62W1p3UsJ2z4DsHtMBQtjzp3ZsUglcQn62WOUgW0y795c7A5uZ+GCEIvzkMatLIlAsbNTA==
+
case-sensitive-paths-webpack-plugin@^2.2.0:
version "2.2.0"
resolved "https://registry.yarnpkg.com/case-sensitive-paths-webpack-plugin/-/case-sensitive-paths-webpack-plugin-2.2.0.tgz#3371ef6365ef9c25fa4b81c16ace0e9c7dc58c3e"
@@ -2126,11 +2244,11 @@ copy-descriptor@^0.1.0:
integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
core-js-compat@^3.6.0:
- version "3.6.0"
- resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.6.0.tgz#4eb6cb69d03d99159ed7c860cd5fcf7d23a62ea9"
- integrity sha512-Z3eCNjGgoYluH89Jt4wVkfYsc/VdLrA2/woX5lm0isO/pCT+P+Y+o65bOuEnjDJLthdwTBxbCVzptTXtc18fJg==
+ version "3.6.4"
+ resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.6.4.tgz#938476569ebb6cda80d339bcf199fae4f16fff17"
+ integrity sha512-zAa3IZPvsJ0slViBQ2z+vgyyTuhd3MFn1rBQjZSKVEgB0UMYhUkCj9jJUVPgGTGqWvsBVmfnruXgTcNyTlEiSA==
dependencies:
- browserslist "^4.8.2"
+ browserslist "^4.8.3"
semver "7.0.0"
core-js@^3.1.4, core-js@^3.3.4, core-js@^3.4.0:
@@ -2446,7 +2564,7 @@ debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.9:
dependencies:
ms "2.0.0"
-debug@^3.0.0, debug@^3.1.1, debug@^3.2.5, debug@^3.2.6:
+debug@^3.0.0, debug@^3.1.1, debug@^3.2.5:
version "3.2.6"
resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==
@@ -2580,11 +2698,6 @@ detect-file@^1.0.0:
resolved "https://registry.yarnpkg.com/detect-file/-/detect-file-1.0.0.tgz#f0d66d03672a825cb1b73bdb3fe62310c8e552b7"
integrity sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc=
-detect-libc@^1.0.2:
- version "1.0.3"
- resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
- integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=
-
detect-node@^2.0.4:
version "2.0.4"
resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.4.tgz#014ee8f8f669c5c58023da64b8179c083a28c46c"
@@ -2705,15 +2818,22 @@ ecc-jsbn@~0.1.1:
jsbn "~0.1.0"
safer-buffer "^2.1.0"
+echarts@^4.5.0:
+ version "4.5.0"
+ resolved "https://registry.yarnpkg.com/echarts/-/echarts-4.5.0.tgz#2111960645a345eb819ddac4792a2c065bdff162"
+ integrity sha512-q9M0errodeX/786uPifro76x0elbrUQkbSHh235QzbkaASuvP9AQoMErhGBno4iC/yq6kFDLqgmm3XCPWQGLzA==
+ dependencies:
+ zrender "4.1.2"
+
ee-first@1.1.1:
version "1.1.1"
resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
-electron-to-chromium@^1.3.322:
- version "1.3.322"
- resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.322.tgz#a6f7e1c79025c2b05838e8e344f6e89eb83213a8"
- integrity sha512-Tc8JQEfGQ1MzfSzI/bTlSr7btJv/FFO7Yh6tanqVmIWOuNCu6/D1MilIEgLtmWqIrsv+o4IjpLAhgMBr/ncNAA==
+electron-to-chromium@^1.3.338:
+ version "1.3.340"
+ resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.340.tgz#5d4fe78e984d4211194cf5a52e08069543da146f"
+ integrity sha512-hRFBAglhcj5iVYH+o8QU0+XId1WGoc0VGowJB1cuJAt3exHGrivZvWeAO5BRgBZqwZtwxjm8a5MQeGoT/Su3ww==
elliptic@^6.0.0:
version "6.5.2"
@@ -2847,9 +2967,9 @@ eslint-import-resolver-node@^0.3.2:
resolve "^1.13.1"
eslint-module-utils@^2.4.1:
- version "2.5.0"
- resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.5.0.tgz#cdf0b40d623032274ccd2abd7e64c4e524d6e19c"
- integrity sha512-kCo8pZaNz2dsAW7nCUjuVoI11EBXXpIzfNxmaoLhXoRDOnqXLC4iSGVRdZPhOitfbdEfMEfKOiENaK6wDPZEGw==
+ version "2.5.2"
+ resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.5.2.tgz#7878f7504824e1b857dd2505b59a8e5eda26a708"
+ integrity sha512-LGScZ/JSlqGKiT8OC+cYRxseMjyqt6QO54nl281CK93unD89ijSeRV6An8Ci/2nvWVKe8K/Tqdm75RQoIOCr+Q==
dependencies:
debug "^2.6.9"
pkg-dir "^2.0.0"
@@ -2925,7 +3045,7 @@ eslint-utils@^1.4.2, eslint-utils@^1.4.3:
dependencies:
eslint-visitor-keys "^1.1.0"
-eslint-visitor-keys@^1.1.0:
+eslint-visitor-keys@^1.0.0, eslint-visitor-keys@^1.1.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz#e2a82cea84ff246ad6fb57f9bde5b46621459ec2"
integrity sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A==
@@ -3168,11 +3288,6 @@ extsprintf@^1.2.0:
resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8=
-fast-deep-equal@^2.0.1:
- version "2.0.1"
- resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"
- integrity sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=
-
fast-deep-equal@^3.1.1:
version "3.1.1"
resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz#545145077c501491e33b15ec408c294376e94ae4"
@@ -3410,13 +3525,6 @@ from2@^2.1.0:
inherits "^2.0.1"
readable-stream "^2.0.0"
-fs-minipass@^1.2.5:
- version "1.2.7"
- resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.7.tgz#ccff8570841e7fe4265693da88936c55aed7f7c7"
- integrity sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==
- dependencies:
- minipass "^2.6.0"
-
fs-minipass@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.0.0.tgz#a6415edab02fae4b9e9230bc87ee2e4472003cd1"
@@ -3446,7 +3554,6 @@ fsevents@^1.2.7:
dependencies:
bindings "^1.5.0"
nan "^2.12.1"
- node-pre-gyp "*"
fstream@^1.0.0, fstream@^1.0.12:
version "1.0.12"
@@ -3764,6 +3871,11 @@ hex-color-regex@^1.1.0:
resolved "https://registry.yarnpkg.com/hex-color-regex/-/hex-color-regex-1.1.0.tgz#4c06fccb4602fe2602b3c93df82d7e7dbf1a8a8e"
integrity sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ==
+highcharts@^7.2.1:
+ version "7.2.1"
+ resolved "https://registry.yarnpkg.com/highcharts/-/highcharts-7.2.1.tgz#313c434bbfd4525a72b76c6bfbd9c39dfe2d1993"
+ integrity sha512-/fSUZiONmM+x49IQJNf8XwZGiNGOPRmxEOcd0xdJP9Xc3OlG46ZiUWgSLfhYQ9Oyhmzc3V3SKYCLud8+rKLi+w==
+
hmac-drbg@^1.0.0:
version "1.0.1"
resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1"
@@ -3919,7 +4031,7 @@ https-browserify@^1.0.0:
resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"
integrity sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=
-iconv-lite@0.4.24, iconv-lite@^0.4.24, iconv-lite@^0.4.4:
+iconv-lite@0.4.24, iconv-lite@^0.4.24:
version "0.4.24"
resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
@@ -3943,19 +4055,12 @@ iferr@^0.1.5:
resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501"
integrity sha1-xg7taebY/bazEEofy8ocGS3FtQE=
-ignore-walk@^3.0.1:
- version "3.0.3"
- resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.3.tgz#017e2447184bfeade7c238e4aefdd1e8f95b1e37"
- integrity sha512-m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw==
- dependencies:
- minimatch "^3.0.4"
-
ignore@^4.0.6:
version "4.0.6"
resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc"
integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==
-ignore@^5.1.1:
+ignore@^5.1.1, ignore@~5.1.4:
version "5.1.4"
resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.4.tgz#84b7b3dbe64552b6ef0eca99f6743dbec6d97adf"
integrity sha512-MzbUSahkTW1u7JpKKjY7LCARd1fU5W2rLdxlM4kdkayuCwZImjkpluF9CM1aLewYJguPDqewLam18Y6AU69A8A==
@@ -4483,7 +4588,7 @@ js-levenshtein@^1.1.3:
resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
-js-yaml@^3.13.1:
+js-yaml@^3.13.1, js-yaml@~3.13.1:
version "3.13.1"
resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847"
integrity sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==
@@ -4564,6 +4669,11 @@ json5@^2.1.0:
dependencies:
minimist "^1.2.0"
+jsonc-parser@~2.2.0:
+ version "2.2.0"
+ resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-2.2.0.tgz#f206f87f9d49d644b7502052c04e82dd6392e9ef"
+ integrity sha512-4fLQxW1j/5fWj6p78vAlAafoCKtuBm6ghv+Ij5W2DrDx0qE+ZdEl2c6Ko1mgJNF5ftX1iEWQQ4Ap7+3GlhjkOA==
+
jsprim@^1.2.2:
version "1.4.1"
resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"
@@ -4848,32 +4958,34 @@ markdown-it@10.0.0:
mdurl "^1.0.1"
uc.micro "^1.0.5"
-markdownlint-cli@^0.19.0:
- version "0.19.0"
- resolved "https://registry.yarnpkg.com/markdownlint-cli/-/markdownlint-cli-0.19.0.tgz#70ccd7334d667c94b3259b5dfc1978cf2199a6fd"
- integrity sha512-5hUEBAmbCVJflws6841HJ0KTZdgGWYaPThoXPI6Wjn1VkoiYWsprNH0r3PvPmyGXtvbHJ7/7eGPde2a6cx8t0w==
+markdownlint-cli@^0.21.0:
+ version "0.21.0"
+ resolved "https://registry.yarnpkg.com/markdownlint-cli/-/markdownlint-cli-0.21.0.tgz#d792b157e9de63ce1d6b6e13d7cf83d5e552d5e8"
+ integrity sha512-gvnczz3W3Wgex851/cIQ/2y8GNhY+EVK8Ael8kRd8hoSQ0ps9xjhtwPwMyJPoiYbAoPxG6vSBFISiysaAbCEZg==
dependencies:
commander "~2.9.0"
deep-extend "~0.5.1"
get-stdin "~5.0.1"
glob "~7.1.2"
- js-yaml "^3.13.1"
+ ignore "~5.1.4"
+ js-yaml "~3.13.1"
+ jsonc-parser "~2.2.0"
lodash.differencewith "~4.5.0"
lodash.flatten "~4.4.0"
- markdownlint "~0.17.1"
- markdownlint-rule-helpers "~0.5.0"
+ markdownlint "~0.18.0"
+ markdownlint-rule-helpers "~0.6.0"
minimatch "~3.0.4"
rc "~1.2.7"
-markdownlint-rule-helpers@~0.5.0:
- version "0.5.0"
- resolved "https://registry.yarnpkg.com/markdownlint-rule-helpers/-/markdownlint-rule-helpers-0.5.0.tgz#316569329f2341b8066817292a6733ef56571301"
- integrity sha512-6bJAV4TjUoDDnqxfb6EKTuZlpYI6vn4kerid7WTrZaEjsWuYDeYDAN+r4o+vbUYFZfJkiBU7NPBqPd4QJ1CZzQ==
+markdownlint-rule-helpers@~0.6.0:
+ version "0.6.0"
+ resolved "https://registry.yarnpkg.com/markdownlint-rule-helpers/-/markdownlint-rule-helpers-0.6.0.tgz#3a866a340d394d21d40777b787d3ad84489405c5"
+ integrity sha512-LiZVAbg9/cqkBHtLNNqHV3xuy4Y2L/KuGU6+ZXqCT9NnCdEkIoxeI5/96t+ExquBY0iHy2CVWxPH16nG1RKQVQ==
-markdownlint@~0.17.1:
- version "0.17.2"
- resolved "https://registry.yarnpkg.com/markdownlint/-/markdownlint-0.17.2.tgz#de0ab144fbf314fedadcb8a4ce0db9ea819f91a5"
- integrity sha512-vsxopn0qEdm0P2XI3S9sVA+jvjKjR8lHZ+0FKlusth+1UK9tI29mRFkKeZPERmbWsMehJcogfMieBUkMgNEFkQ==
+markdownlint@~0.18.0:
+ version "0.18.0"
+ resolved "https://registry.yarnpkg.com/markdownlint/-/markdownlint-0.18.0.tgz#906ab9229da4c4be074d0b79de23a69bfa8471d3"
+ integrity sha512-nQAfK9Pbq0ZRoMC/abNGterEnV3kL8MZmi0WHhw8WJKoIbsm3cXGufGsxzCRvjW15cxe74KWcxRSKqwplS26Bw==
dependencies:
markdown-it "10.0.0"
@@ -5069,14 +5181,6 @@ minipass-pipeline@^1.2.2:
dependencies:
minipass "^3.0.0"
-minipass@^2.6.0, minipass@^2.8.6, minipass@^2.9.0:
- version "2.9.0"
- resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.9.0.tgz#e713762e7d3e32fed803115cf93e04bca9fcc9a6"
- integrity sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==
- dependencies:
- safe-buffer "^5.1.2"
- yallist "^3.0.0"
-
minipass@^3.0.0, minipass@^3.1.1:
version "3.1.1"
resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.1.1.tgz#7607ce778472a185ad6d89082aa2070f79cedcd5"
@@ -5084,13 +5188,6 @@ minipass@^3.0.0, minipass@^3.1.1:
dependencies:
yallist "^4.0.0"
-minizlib@^1.2.1:
- version "1.3.3"
- resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.3.3.tgz#2290de96818a34c29551c8a8d301216bd65a861d"
- integrity sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==
- dependencies:
- minipass "^2.9.0"
-
mississippi@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-3.0.0.tgz#ea0a3291f97e0b5e8776b363d5f0a12d94c67022"
@@ -5199,15 +5296,6 @@ natural-compare@^1.4.0:
resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=
-needle@^2.2.1:
- version "2.4.0"
- resolved "https://registry.yarnpkg.com/needle/-/needle-2.4.0.tgz#6833e74975c444642590e15a750288c5f939b57c"
- integrity sha512-4Hnwzr3mi5L97hMYeNl8wRW/Onhy4nUKR/lVemJ8gJedxxUyBLm9kkrDColJvoSfwi0jCNhD+xCdOtiGDQiRZg==
- dependencies:
- debug "^3.2.6"
- iconv-lite "^0.4.4"
- sax "^1.2.4"
-
negotiator@0.6.2:
version "0.6.2"
resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb"
@@ -5275,26 +5363,10 @@ node-libs-browser@^2.2.1:
util "^0.11.0"
vm-browserify "^1.0.1"
-node-pre-gyp@*:
- version "0.14.0"
- resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.14.0.tgz#9a0596533b877289bcad4e143982ca3d904ddc83"
- integrity sha512-+CvDC7ZttU/sSt9rFjix/P05iS43qHCOOGzcr3Ry99bXG7VX953+vFyEuph/tfqoYu8dttBkE86JSKBO2OzcxA==
- dependencies:
- detect-libc "^1.0.2"
- mkdirp "^0.5.1"
- needle "^2.2.1"
- nopt "^4.0.1"
- npm-packlist "^1.1.6"
- npmlog "^4.0.2"
- rc "^1.2.7"
- rimraf "^2.6.1"
- semver "^5.3.0"
- tar "^4.4.2"
-
-node-releases@^1.1.42:
- version "1.1.45"
- resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.45.tgz#4cf7e9175d71b1317f15ffd68ce63bce1d53e9f2"
- integrity sha512-cXvGSfhITKI8qsV116u2FTzH5EWZJfgG7d4cpqwF8I8+1tWpD6AsvvGRKq2onR0DNj1jfqsjkXZsm14JMS7Cyg==
+node-releases@^1.1.46:
+ version "1.1.47"
+ resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.47.tgz#c59ef739a1fd7ecbd9f0b7cf5b7871e8a8b591e4"
+ integrity sha512-k4xjVPx5FpwBUj0Gw7uvFOTF4Ep8Hok1I6qjwL3pLfwe7Y0REQSAqOwwv9TWBCUtMHxcXfY4PgRLRozcChvTcA==
dependencies:
semver "^6.3.0"
@@ -5328,14 +5400,6 @@ node-sass@^4.13.0:
dependencies:
abbrev "1"
-nopt@^4.0.1:
- version "4.0.1"
- resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d"
- integrity sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=
- dependencies:
- abbrev "1"
- osenv "^0.1.4"
-
normalize-package-data@^2.3.2, normalize-package-data@^2.3.4:
version "2.5.0"
resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
@@ -5378,26 +5442,6 @@ normalize-url@^3.0.0:
resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-3.3.0.tgz#b2e1c4dc4f7c6d57743df733a4f5978d18650559"
integrity sha512-U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg==
-npm-bundled@^1.0.1:
- version "1.1.1"
- resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.1.1.tgz#1edd570865a94cdb1bc8220775e29466c9fb234b"
- integrity sha512-gqkfgGePhTpAEgUsGEgcq1rqPXA+tv/aVBlgEzfXwA1yiUJF7xtEt3CtVwOjNYQOVknDk0F20w58Fnm3EtG0fA==
- dependencies:
- npm-normalize-package-bin "^1.0.1"
-
-npm-normalize-package-bin@^1.0.1:
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz#6e79a41f23fd235c0623218228da7d9c23b8f6e2"
- integrity sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA==
-
-npm-packlist@^1.1.6:
- version "1.4.7"
- resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.7.tgz#9e954365a06b80b18111ea900945af4f88ed4848"
- integrity sha512-vAj7dIkp5NhieaGZxBJB8fF4R0078rqsmhJcAfXZ6O7JJhjhPK96n5Ry1oZcfLXgfun0GWTZPOxaEyqv8GBykQ==
- dependencies:
- ignore-walk "^3.0.1"
- npm-bundled "^1.0.1"
-
npm-run-path@^2.0.0:
version "2.0.2"
resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
@@ -5405,7 +5449,7 @@ npm-run-path@^2.0.0:
dependencies:
path-key "^2.0.0"
-"npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.0, npmlog@^4.0.2:
+"npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.0:
version "4.1.2"
resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==
@@ -5609,7 +5653,7 @@ os-tmpdir@^1.0.0, os-tmpdir@~1.0.2:
resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=
-osenv@0, osenv@^0.1.4:
+osenv@0:
version "0.1.5"
resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410"
integrity sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==
@@ -5886,9 +5930,9 @@ pbkdf2@^3.0.3:
sha.js "^2.4.8"
perfect-scrollbar@^1.4.0:
- version "1.4.0"
- resolved "https://registry.yarnpkg.com/perfect-scrollbar/-/perfect-scrollbar-1.4.0.tgz#5d014ef9775e1f43058a1dbae9ed1daf0e7091f1"
- integrity sha512-/2Sk/khljhdrsamjJYS5NjrH+GKEHEwh7zFSiYyxROyYKagkE4kSn2zDQDRTOMo8mpT2jikxx6yI1dG7lNP/hw==
+ version "1.5.0"
+ resolved "https://registry.yarnpkg.com/perfect-scrollbar/-/perfect-scrollbar-1.5.0.tgz#821d224ed8ff61990c23f26db63048cdc75b6b83"
+ integrity sha512-NrNHJn5mUGupSiheBTy6x+6SXCFbLlm8fVZh9moIzw/LgqElN5q4ncR4pbCBCYuCJ8Kcl9mYM0NgDxvW+b4LxA==
performance-now@^2.1.0:
version "2.1.0"
@@ -6787,7 +6831,7 @@ raw-body@2.4.0:
iconv-lite "0.4.24"
unpipe "1.0.0"
-rc@^1.2.7, rc@~1.2.7:
+rc@~1.2.7:
version "1.2.8"
resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==
@@ -7107,7 +7151,7 @@ rgba-regex@^1.0.0:
resolved "https://registry.yarnpkg.com/rgba-regex/-/rgba-regex-1.0.0.tgz#43374e2e2ca0968b0ef1523460b7d730ff22eeb3"
integrity sha1-QzdOLiyglosO8VI0YLfXMP8i7rM=
-rimraf@2, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.3, rimraf@^2.7.1:
+rimraf@2, rimraf@^2.5.4, rimraf@^2.6.3, rimraf@^2.7.1:
version "2.7.1"
resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==
@@ -7193,7 +7237,7 @@ sass-loader@7.3.1:
pify "^4.0.1"
semver "^6.3.0"
-sax@^1.2.4, sax@~1.2.4:
+sax@~1.2.4:
version "1.2.4"
resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
@@ -7240,7 +7284,7 @@ selfsigned@^1.10.7:
dependencies:
node-forge "0.9.0"
-"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0:
+"semver@2 || 3 || 4 || 5", semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0:
version "5.7.1"
resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
@@ -7619,6 +7663,14 @@ stdout-stream@^1.4.0:
dependencies:
readable-stream "^2.0.1"
+stimulus@^1.1.1:
+ version "1.1.1"
+ resolved "https://registry.yarnpkg.com/stimulus/-/stimulus-1.1.1.tgz#53c2fded6849e7b85eed3ed8dd76e33abd74bec5"
+ integrity sha512-R0mBqKp48YnRDZOxZ8hiOH4Ilph3Yj78CIFTBkCwyHs4iGCpe7xlEdQ7cjIxb+7qVCSxFKgxO+mAQbsNgt/5XQ==
+ dependencies:
+ "@stimulus/core" "^1.1.1"
+ "@stimulus/webpack-helpers" "^1.1.1"
+
stream-browserify@^2.0.1:
version "2.0.2"
resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.2.tgz#87521d38a44aa7ee91ce1cd2a47df0cb49dd660b"
@@ -7879,19 +7931,6 @@ tar@^2.0.0:
fstream "^1.0.12"
inherits "2"
-tar@^4.4.2:
- version "4.4.13"
- resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.13.tgz#43b364bc52888d555298637b10d60790254ab525"
- integrity sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA==
- dependencies:
- chownr "^1.1.1"
- fs-minipass "^1.2.5"
- minipass "^2.8.6"
- minizlib "^1.2.1"
- mkdirp "^0.5.0"
- safe-buffer "^5.1.2"
- yallist "^3.0.3"
-
terser-webpack-plugin@^1.4.3:
version "1.4.3"
resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.3.tgz#5ecaf2dbdc5fb99745fd06791f46fc9ddb1c9a7c"
@@ -8555,7 +8594,7 @@ yallist@^2.1.2:
resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=
-yallist@^3.0.0, yallist@^3.0.2, yallist@^3.0.3:
+yallist@^3.0.2:
version "3.1.1"
resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"
integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==
@@ -8648,3 +8687,8 @@ yargs@^7.0.0:
which-module "^1.0.0"
y18n "^3.2.1"
yargs-parser "^5.0.0"
+
+zrender@4.1.2:
+ version "4.1.2"
+ resolved "https://registry.yarnpkg.com/zrender/-/zrender-4.1.2.tgz#8368deff24c7e237cbcbd3a2ff93017905ae43f7"
+ integrity sha512-MJYEo1ZOVesjxYsfcGtPXnUREmh4ACMV08QZLGZ3S7D1xOd96iz3O6nf6pv5PHb5NSHkbizr7ChSIgtAGwncvA==
-
-
-
-
-
-
-