-
<%= t(title) %>
+
+ <%= t(title) %>
+
<%= content %>
<%= link_to path, class: 'btn btn-block btn-secondary' do %>
<%= t('action_group.show') %>
diff --git a/app/views/admin/yoksis_dashboard/index.html.erb b/app/views/admin/yoksis_dashboard/index.html.erb
new file mode 100644
index 000000000..19e6db76a
--- /dev/null
+++ b/app/views/admin/yoksis_dashboard/index.html.erb
@@ -0,0 +1,26 @@
+
+ <% yoksis_klasses = %w[
+ HighSchoolType
+ StudentDisabilityType
+ StudentDropOutType
+ StudentEducationLevel
+ StudentEntrancePointType
+ StudentEntranceType
+ StudentGrade
+ StudentGradingSystem
+ StudentPunishmentType
+ StudentStudentshipStatus
+ UnitInstructionLanguage
+ UnitInstructionType
+ UnitStatus
+ UnitType
+ UniversityType
+ ] %>
+
+ <% yoksis_klasses.each do |klass| %>
+ <%= render 'card',
+ content: klass.constantize.count,
+ title: ".#{klass.tableize}",
+ path: send("admin_#{klass.tableize}_path") %>
+ <% end %>
+
diff --git a/app/views/calendar/academic_calendars/_calendar_event_fields.erb b/app/views/calendar/academic_calendars/_calendar_event_fields.erb
deleted file mode 100644
index d6d1f36ab..000000000
--- a/app/views/calendar/academic_calendars/_calendar_event_fields.erb
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
- <%= f.input :calendar_title_id,
- collection: @academic_calendar.calendar_type.titles,
- input_html: { class: 'select_search_class' } %>
- <%= f.input :start_date,
- as: :date_time_picker,
- input_html: { data: { class: 'event-date'} } %>
- <%= f.input :end_date,
- as: :date_time_picker,
- input_html: { data: { class: 'event-date'} } %>
-
-
-
-
diff --git a/app/views/calendar/academic_calendars/_form.html.erb b/app/views/calendar/academic_calendars/_form.html.erb
deleted file mode 100644
index 38a960166..000000000
--- a/app/views/calendar/academic_calendars/_form.html.erb
+++ /dev/null
@@ -1,72 +0,0 @@
-
-
-
-
-
- <%= simple_form_for(academic_calendar) do |f| %>
-
-
- <%= f.error_notification %>
- <%= f.error_notification message: f.object.errors[:base].to_sentence if f.object.errors[:base].present? %>
-
-
- <%= f.input :name %>
-
-
- <%= f.association :academic_term, label_method: lambda { |academic_term| full_name(academic_term) }, value_method: :id %>
-
-
- <%= f.association :calendar_type %>
-
-
- <%= f.input :senate_decision_date,
- as: :date_time_picker,
- input_html: { data: { class: 'senate_decision_date'} } %>
-
-
- <%= f.input :senate_decision_no %>
-
-
- <%= f.input :description %>
-
-
- <% if academic_calendar.persisted? %>
-
- <%= f.association :units, collection: Unit.active.where(unit_type: f.object.calendar_type.unit_type_ids),
- label_method: :names_depth_cache, required: true %>
-
-
-
<%= t('.events') %>
-
- <%= f.simple_fields_for :calendar_events do |event| %>
- <%= render 'calendar_event_fields', f: event %>
- <% end %>
-
<%= link_to_add_association t('.new_event_link'), f, :calendar_events, class: 'btn btn-outline-primary btn-sm' %>
-
- <% end %>
-
- <%= f.button :submit, class: 'btn btn-outline-success btn-sm' %>
- <%= link_to_back(:back) %>
-
- <% end %>
-
-
-
-
-
-<%= javascript_include_tag 'shared/cocoon' %>
-<%= render 'select2' %>
-
-
\ No newline at end of file
diff --git a/app/views/calendar/academic_calendars/_select2.html.erb b/app/views/calendar/academic_calendars/_select2.html.erb
deleted file mode 100644
index 159bbc742..000000000
--- a/app/views/calendar/academic_calendars/_select2.html.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-
diff --git a/app/views/calendar/academic_calendars/edit.html.erb b/app/views/calendar/academic_calendars/edit.html.erb
deleted file mode 100644
index f10199059..000000000
--- a/app/views/calendar/academic_calendars/edit.html.erb
+++ /dev/null
@@ -1 +0,0 @@
-<%= render 'form', academic_calendar: @academic_calendar, form_title: t('.form_title') %>
diff --git a/app/views/calendar/academic_calendars/index.html.erb b/app/views/calendar/academic_calendars/index.html.erb
deleted file mode 100644
index 8b02a8dd1..000000000
--- a/app/views/calendar/academic_calendars/index.html.erb
+++ /dev/null
@@ -1,55 +0,0 @@
-
- <%= link_to_new(new_academic_calendar_path, t('.new_academic_calendar_link')) %>
-
-
-
-
-
-
-
- <%= render 'components/smart_search_form',
- path: academic_calendars_path,
- placeholder: t('.name') %>
-
-
-
- <%= t('.name') %>
- <%= t('.academic_term') %>
- <%= t('.calendar_type') %>
- <%= t('.senate_decision_date') %>
- <%= t('.senate_decision_no') %>
- <%= t('created_at') %>
- <%= t('updated_at') %>
- <%= t('actions') %>
-
-
-
- <% @academic_calendars.each do |academic_calendar| %>
-
- <%= academic_calendar.name %>
- <%= full_name(academic_calendar.academic_term) %>
- <%= academic_calendar.calendar_type.name %>
- <%= academic_calendar.senate_decision_date %>
- <%= academic_calendar.senate_decision_no %>
- <%= academic_calendar.created_at.to_date %>
- <%= academic_calendar.updated_at.to_date %>
-
- <%= link_to_show(academic_calendar_path(academic_calendar)) %>
- <%= link_to_edit(edit_academic_calendar_path(academic_calendar)) %>
- <%= link_to_destroy(academic_calendar) %>
-
-
- <% end %>
-
-
-
-
-
-
-
-
-
diff --git a/app/views/calendar/academic_calendars/new.html.erb b/app/views/calendar/academic_calendars/new.html.erb
deleted file mode 100644
index f10199059..000000000
--- a/app/views/calendar/academic_calendars/new.html.erb
+++ /dev/null
@@ -1 +0,0 @@
-<%= render 'form', academic_calendar: @academic_calendar, form_title: t('.form_title') %>
diff --git a/app/views/calendar/academic_calendars/show.html.erb b/app/views/calendar/academic_calendars/show.html.erb
deleted file mode 100644
index 33342b481..000000000
--- a/app/views/calendar/academic_calendars/show.html.erb
+++ /dev/null
@@ -1,70 +0,0 @@
-
- <%= link_to_back(:back) %>
-
-
-
-
-
-
-
-
-
-
- <%= t('.name') %>
- <%= t('.calendar_type') %>
- <%= t('.senate_decision_date') %>
- <%= t('.senate_decision_no') %>
- <%= t('created_at') %>
- <%= t('updated_at') %>
- <%= t('actions') %>
-
-
-
-
- <%= full_name(@academic_calendar.academic_term) %>
- <%= @academic_calendar.type_name %>
- <%= @academic_calendar.senate_decision_date %>
- <%= @academic_calendar.senate_decision_no %>
- <%= @academic_calendar.created_at.to_date %>
- <%= @academic_calendar.updated_at.to_date %>
- <%= link_to_edit(edit_academic_calendar_path(@academic_calendar)) %>
-
-
-
- <%= t('.description') %>: <%= @academic_calendar.description %>
-
-
-
-
-
-
-
-
-
-
- <%= t('.event_title') %>
- <%= t('.event_start_date') %>
- <%= t('.event_end_date') %>
-
-
-
- <% @events.each do |event| %>
-
- <%= event.calendar_title_name %>
- <%= event.start_date.strftime('%F %T') %>
- <%= event.end_date.try(:strftime, '%F %T') %>
-
- <% end %>
-
-
-
-
-
-
-
-
-
diff --git a/app/views/calendar/academic_terms/index.html.erb b/app/views/calendar/academic_terms/index.html.erb
deleted file mode 100644
index e5f91fb07..000000000
--- a/app/views/calendar/academic_terms/index.html.erb
+++ /dev/null
@@ -1,47 +0,0 @@
-
- <%= link_to_new(new_academic_term_path, t('.new_academic_term_link')) %>
-
-
-
-
-
-
-
-
-
-
- <%= t('.year') %>
- <%= t('.term') %>
- <%= t('.start_of_term') %>
- <%= t('.end_of_term') %>
- <%= t('.active') %>
- <%= t('actions') %>
-
-
-
- <% @academic_terms.each do |academic_term| %>
-
- <%= academic_term.year %>
- <%= enum_t(academic_term, :term) %>
- <%= academic_term.start_of_term.try(:strftime, '%F %T') %>
- <%= academic_term.end_of_term.try(:strftime, '%F %T') %>
- <%= academic_term.active? ? t('active') : t('passive') %>
-
- <%= link_to_edit(edit_academic_term_path(academic_term)) %>
- <%= link_to_destroy(academic_term) %>
-
-
- <% end %>
-
-
-
-
-
-
-
-
-
diff --git a/app/views/calendar/calendar_titles/_form.html.erb b/app/views/calendar/calendar_titles/_form.html.erb
deleted file mode 100644
index abee67662..000000000
--- a/app/views/calendar/calendar_titles/_form.html.erb
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-
-
-
- <%= simple_form_for(calendar_title) do |f| %>
-
-
- <%= f.error_notification %>
- <%= f.error_notification message: f.object.errors[:base].to_sentence if f.object.errors[:base].present? %>
-
-
-
-
-
- <%= f.association :types, as: :check_boxes %>
-
-
- <%= f.button :submit, class: 'btn btn-outline-success btn-sm' %>
- <%= link_to_back(:back) %>
-
-
- <% end %>
-
-
-
-
diff --git a/app/views/calendar/calendar_titles/edit.html.erb b/app/views/calendar/calendar_titles/edit.html.erb
deleted file mode 100644
index 43055b35c..000000000
--- a/app/views/calendar/calendar_titles/edit.html.erb
+++ /dev/null
@@ -1 +0,0 @@
-<%= render 'form', calendar_title: @calendar_title, form_title: t('.form_title') %>
diff --git a/app/views/calendar/calendar_titles/index.html.erb b/app/views/calendar/calendar_titles/index.html.erb
deleted file mode 100644
index 76886f9ac..000000000
--- a/app/views/calendar/calendar_titles/index.html.erb
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-
-
-
- <%= render 'components/smart_search_form',
- path: calendar_titles_path,
- placeholder: t('.name') %>
-
-
-
- <%= t('.name') %>
- <%= t('.type') %>
- <%= t('actions') %>
-
-
-
- <% @calendar_titles.each do |calendar_title| %>
-
- <%= calendar_title.name %>
- <%= calendar_title.types.map(&:name).join(', ') %>
-
- <%= link_to_edit(edit_calendar_title_path(calendar_title), t('.select_calendar_type')) %>
-
-
- <% end %>
-
-
-
-
-
-
-
-
-
diff --git a/app/views/calendar/calendar_titles/new.html.erb b/app/views/calendar/calendar_titles/new.html.erb
deleted file mode 100644
index 43055b35c..000000000
--- a/app/views/calendar/calendar_titles/new.html.erb
+++ /dev/null
@@ -1 +0,0 @@
-<%= render 'form', calendar_title: @calendar_title, form_title: t('.form_title') %>
diff --git a/app/views/calendar/calendar_types/_form.html.erb b/app/views/calendar/calendar_types/_form.html.erb
deleted file mode 100644
index bedcc1a81..000000000
--- a/app/views/calendar/calendar_types/_form.html.erb
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-
-
- <%= simple_form_for(calendar_type) do |f| %>
-
-
- <%= f.error_notification %>
- <%= f.error_notification message: f.object.errors[:base].to_sentence if f.object.errors[:base].present? %>
-
-
- <%= f.input :name %>
-
-
- <%= f.association :unit_types, as: :check_boxes %>
-
-
- <%= f.button :submit, class: 'btn btn-outline-success btn-sm' %>
- <%= link_to_back(:back) %>
-
-
- <% end %>
-
-
-
-
diff --git a/app/views/calendar/calendar_types/edit.html.erb b/app/views/calendar/calendar_types/edit.html.erb
deleted file mode 100644
index 281a1ef3d..000000000
--- a/app/views/calendar/calendar_types/edit.html.erb
+++ /dev/null
@@ -1 +0,0 @@
-<%= render 'form', calendar_type: @calendar_type, form_title: t('.form_title') %>
diff --git a/app/views/calendar/calendar_types/index.html.erb b/app/views/calendar/calendar_types/index.html.erb
deleted file mode 100644
index b16e266ab..000000000
--- a/app/views/calendar/calendar_types/index.html.erb
+++ /dev/null
@@ -1,40 +0,0 @@
-
- <%= link_to_new(new_calendar_type_path, t('.new_calendar_type_link')) %>
-
-
-
-
-
-
-
-
-
-
- <%= t('.name') %>
- <%= t('actions') %>
-
-
-
- <% @calendar_types.each do |calendar_type| %>
-
- <%= calendar_type.name %>
-
- <%= link_to_show(calendar_type_path(calendar_type)) %>
- <%= link_to_edit(edit_calendar_type_path(calendar_type)) %>
- <%= link_to_destroy(calendar_type) %>
-
-
- <% end %>
-
-
-
-
-
-
-
-
-
diff --git a/app/views/calendar/calendar_types/new.html.erb b/app/views/calendar/calendar_types/new.html.erb
deleted file mode 100644
index 281a1ef3d..000000000
--- a/app/views/calendar/calendar_types/new.html.erb
+++ /dev/null
@@ -1 +0,0 @@
-<%= render 'form', calendar_type: @calendar_type, form_title: t('.form_title') %>
diff --git a/app/views/calendar/calendar_types/show.html.erb b/app/views/calendar/calendar_types/show.html.erb
deleted file mode 100644
index dde3be3da..000000000
--- a/app/views/calendar/calendar_types/show.html.erb
+++ /dev/null
@@ -1,45 +0,0 @@
-
- <%= link_to_back calendar_types_path %>
-
-
-
-
-
-
-
-
-
-
- <%= t('.unit_types') %>
- <%= @calendar_type.unit_types.map(&:name).join(', ')%>
-
-
-
-
-
-
-
-
-
- <%= t('.calendar_titles') %>
-
-
-
- <% @titles.each do |title| %>
-
- <%= title.name %>
-
- <% end %>
-
-
-
-
-
-
-
-
-
diff --git a/app/views/calendar_management/calendar_event_types/_form.html.erb b/app/views/calendar_management/calendar_event_types/_form.html.erb
new file mode 100644
index 000000000..9aa357340
--- /dev/null
+++ b/app/views/calendar_management/calendar_event_types/_form.html.erb
@@ -0,0 +1,21 @@
+<%= render 'layouts/builders/form',
+ namespace: 'calendar_management',
+ klass: @calendar_event_type,
+ params: [
+ {
+ field: 'name',
+ width: 12,
+ required: true
+ },
+ {
+ field: 'category',
+ width: 12,
+ required: true,
+ collection: CalendarEventType.categories.keys.sort
+ },
+ {
+ field: 'identifier',
+ width: 12,
+ required: true
+ }
+ ] %>
diff --git a/app/views/calendar_management/calendar_event_types/edit.html.erb b/app/views/calendar_management/calendar_event_types/edit.html.erb
new file mode 100644
index 000000000..2d3436368
--- /dev/null
+++ b/app/views/calendar_management/calendar_event_types/edit.html.erb
@@ -0,0 +1 @@
+<%= render 'form' %>
diff --git a/app/views/calendar_management/calendar_event_types/index.html.erb b/app/views/calendar_management/calendar_event_types/index.html.erb
new file mode 100644
index 000000000..68b686ba6
--- /dev/null
+++ b/app/views/calendar_management/calendar_event_types/index.html.erb
@@ -0,0 +1,8 @@
+<%= render 'layouts/builders/index',
+ namespace: 'calendar_management',
+ klass: 'calendar_event_type',
+ collection: @calendar_event_types,
+ pagy: @pagy,
+ card_header: t('.card_header'),
+ params: ['name', 'category', 'identifier'],
+ actions: ['edit', 'destroy'] %>
diff --git a/app/views/calendar_management/calendar_event_types/new.html.erb b/app/views/calendar_management/calendar_event_types/new.html.erb
new file mode 100644
index 000000000..2d3436368
--- /dev/null
+++ b/app/views/calendar_management/calendar_event_types/new.html.erb
@@ -0,0 +1 @@
+<%= render 'form' %>
diff --git a/app/views/calendar_management/calendars/_calendar_event_fields.html.erb b/app/views/calendar_management/calendars/_calendar_event_fields.html.erb
new file mode 100644
index 000000000..b05761795
--- /dev/null
+++ b/app/views/calendar_management/calendars/_calendar_event_fields.html.erb
@@ -0,0 +1,40 @@
+
+
+
+
+
+ <%= f.input :calendar_event_type_id, required: true,
+ collection: CalendarEventType.order(:name),
+ input_html: { class: 'select_search_class' } %>
+
+
+ <%= f.input :start_time, required: true,
+ as: :date_time_picker,
+ input_html: { data: { class: 'event-date'} } %>
+
+
+ <%= f.input :end_time, required: true,
+ as: :date_time_picker,
+ input_html: { data: { class: 'event-date'} } %>
+
+
+ <%= f.input :location %>
+
+
+ <%= f.input :timezone, required: true,
+ collection: timezone_list_with_offset,
+ label_method: :first,
+ value_method: :second %>
+
+
+ <%= f.input :visible %>
+
+
+
+
+ <%= link_to_remove_association t('.delete_event'), f, class: 'btn btn-outline-danger btn-sm' %>
+
+
+
+
+
diff --git a/app/views/calendar_management/calendars/_cocoon.html.erb b/app/views/calendar_management/calendars/_cocoon.html.erb
new file mode 100644
index 000000000..a4fda2136
--- /dev/null
+++ b/app/views/calendar_management/calendars/_cocoon.html.erb
@@ -0,0 +1,9 @@
+
diff --git a/app/views/calendar_management/calendars/_flatpickr.html.erb b/app/views/calendar_management/calendars/_flatpickr.html.erb
new file mode 100644
index 000000000..a046fd80f
--- /dev/null
+++ b/app/views/calendar_management/calendars/_flatpickr.html.erb
@@ -0,0 +1,8 @@
+
diff --git a/app/views/calendar_management/calendars/_form.html.erb b/app/views/calendar_management/calendars/_form.html.erb
new file mode 100644
index 000000000..993622a8e
--- /dev/null
+++ b/app/views/calendar_management/calendars/_form.html.erb
@@ -0,0 +1,65 @@
+
+
+
+
+ <%= simple_form_for([:calendar_management, calendar]) do |f| %>
+
+
+ <%= f.error_notification %>
+ <%= f.error_notification message: f.object.errors[:base].to_sentence if f.object.errors[:base].present? %>
+
+
+ <%= f.input :name, required: true %>
+
+
+ <%= f.input :senate_decision_date,
+ as: :date_time_picker,
+ input_html: { data: { class: 'senate_decision_date'} } %>
+
+
+ <%= f.input :senate_decision_no, required: true %>
+
+
+ <%= f.input :timezone, required: true,
+ collection: timezone_list_with_offset,
+ label_method: :first,
+ value_method: :second %>
+
+
+ <%= f.association :academic_term,
+ label_method: lambda { |academic_term| full_name(academic_term) }, value_method: :id %>
+
+
+ <%= f.input :description, as: :text %>
+
+
+
+
+
+
+ <%= f.simple_fields_for :calendar_events do |event| %>
+ <%= render 'calendar_event_fields', f: event %>
+ <% end %>
+
+
+
+
+ <%= f.button :submit, class: 'btn btn-outline-success btn-sm' %>
+ <%= link_to_back(:back) %>
+
+
+ <% end %>
+
+
+
+
+
+<%= javascript_include_tag 'shared/cocoon' %>
+<%= render 'flatpickr' %>
+<%= render 'cocoon' %>
diff --git a/app/views/calendar_management/calendars/edit.html.erb b/app/views/calendar_management/calendars/edit.html.erb
new file mode 100644
index 000000000..dcf991b5b
--- /dev/null
+++ b/app/views/calendar_management/calendars/edit.html.erb
@@ -0,0 +1 @@
+<%= render 'form', calendar: @calendar %>
diff --git a/app/views/calendar_management/calendars/index.html.erb b/app/views/calendar_management/calendars/index.html.erb
new file mode 100644
index 000000000..14252cfd7
--- /dev/null
+++ b/app/views/calendar_management/calendars/index.html.erb
@@ -0,0 +1,55 @@
+
+
+
+
+
+ <%= render 'layouts/shared/smart_search_form',
+ path: [:calendar_management, :calendars],
+ placeholder: t('.name') %>
+
+
+
+ <%= t('.name') %>
+ <%= t('.senate_decision_date') %>
+ <%= t('.senate_decision_no') %>
+ <%= t('.timezone') %>
+ <%= t('.academic_term') %>
+ <%= t('actions') %>
+
+
+
+ <% @calendars.each do |calendar| %>
+
+ <%= link_to("[#{full_name(calendar.academic_term)}] - #{calendar.name}", [:calendar_management, calendar]) %>
+ <%= calendar.senate_decision_date %>
+ <%= calendar.senate_decision_no %>
+ <%= calendar.timezone %>
+ <%= full_name(calendar.academic_term) %>
+
+ <%= link_to fa_icon('file-pdf-o'), [:calendar_management, calendar, format: :pdf],
+ class: 'btn btn-outline-primary btn-sm' %>
+ <%= link_to_edit([:edit, :calendar_management, calendar]) %>
+ <%= link_to_destroy([:calendar_management, calendar]) %>
+ <%= link_to fa_icon('university', text: t('.assign_to_units')), [:calendar_management, calendar, :units],
+ class: 'btn btn-outline-primary btn-sm' %>
+ <%= link_to fa_icon('copy', text: t('.duplicate')), [:calendar_management, calendar, :duplicate],
+ class: 'btn btn-outline-primary btn-sm' %>
+
+
+ <% end %>
+
+
+
+
+
+
+
+
+
diff --git a/app/views/calendar_management/calendars/new.html.erb b/app/views/calendar_management/calendars/new.html.erb
new file mode 100644
index 000000000..dcf991b5b
--- /dev/null
+++ b/app/views/calendar_management/calendars/new.html.erb
@@ -0,0 +1 @@
+<%= render 'form', calendar: @calendar %>
diff --git a/app/views/calendar_management/calendars/show.html.erb b/app/views/calendar_management/calendars/show.html.erb
new file mode 100644
index 000000000..c899a2098
--- /dev/null
+++ b/app/views/calendar_management/calendars/show.html.erb
@@ -0,0 +1,63 @@
+
+
+
+
+
+
+
+
+
+ <%= t('.senate_decision_date') %>
+ <%= @calendar.senate_decision_date %>
+
+
+ <%= t('.senate_decision_no') %>
+ <%= @calendar.senate_decision_no %>
+
+
+ <%= t('.timezone') %>
+ <%= @calendar.timezone %>
+
+
+ <%= t('.description') %>
+ <%= @calendar.description %>
+
+
+
+
+
+
+ <%= t('activerecord.attributes.calendar_event_type.name') %>
+ <%= t('activerecord.attributes.calendar_event.start_time') %>
+ <%= t('activerecord.attributes.calendar_event.end_time') %>
+ <%= t('activerecord.attributes.calendar_event.location') %>
+ <%= t('activerecord.attributes.calendar_event.timezone') %>
+
+
+
+ <% @calendar.calendar_events.each do |calendar_event| %>
+
+ <%= calendar_event.type_name %>
+ <%= as_date_and_time(calendar_event.start_time) %>
+ <%= as_date_and_time(calendar_event.end_time) %>
+ <%= calendar_event.location %>
+ <%= calendar_event.timezone %>
+
+ <% end %>
+
+
+
+
+
+
diff --git a/app/views/calendar_management/calendars/show.pdf.erb b/app/views/calendar_management/calendars/show.pdf.erb
new file mode 100644
index 000000000..701c7de3c
--- /dev/null
+++ b/app/views/calendar_management/calendars/show.pdf.erb
@@ -0,0 +1,39 @@
+
+
+
+
+
+
+
+
+
+ <%= t('activerecord.attributes.calendar_event.start_time') %> <%= t('activerecord.attributes.calendar_event.end_time') %> <%= t('activerecord.attributes.calendar_event_type.name') %>
+
+
+
+ <% @calendar.calendar_events.each do |calendar_event| %>
+
+ <%= as_date_and_time(calendar_event.start_time) %> <%= as_date_and_time(calendar_event.end_time) %> <%= calendar_event.type_name %>
+
+ <% end %>
+
+
+
+
+ <%= t('.senate_decision', date: @calendar.senate_decision_date, decision_no: @calendar.senate_decision_no) %>
+
<%= @calendar.description %>
+
+
+
+
+
+
diff --git a/app/views/calendar_management/calendars/units.html.erb b/app/views/calendar_management/calendars/units.html.erb
new file mode 100644
index 000000000..361196540
--- /dev/null
+++ b/app/views/calendar_management/calendars/units.html.erb
@@ -0,0 +1,76 @@
+<%= simple_form_for([:calendar_management, @calendar]) do |f| %>
+
+
+
+
+
+
+
<%= t('.alert_text_general') %>
+
+
+ <%= t('.alert_text_programs') %>
+
+
+ <%= f.error_notification %>
+
+
+
+
+
+
+ <%= f.association :units,
+ collection: Unit.active.faculties.order(:name),
+ as: :check_boxes,
+ label: t('.faculties') %>
+
+
+
+
+
+
+ <%= f.association :units,
+ collection: Unit.active.institutes.order(:name),
+ as: :check_boxes,
+ label: t('.institutes') %>
+
+
+
+
+
+
+ <%= f.association :units,
+ collection: Unit.active.research_centers.order(:name),
+ as: :check_boxes,
+ label: t('.research_centers') %>
+
+
+
+
+
+
+ <%= f.association :units,
+ collection: Unit.active.others.order(:name),
+ as: :check_boxes,
+ label: t('.others') %>
+
+
+
+
+
+
+ <%= f.association :units,
+ collection: Unit.active.programs.order(:name),
+ as: :check_boxes,
+ label_method: :names_depth_cache,
+ label: t('.programs') %>
+
+
+
+
+<% end %>
\ No newline at end of file
diff --git a/app/views/committee/agenda_types/index.html.erb b/app/views/committee/agenda_types/index.html.erb
index 3ea384ccc..45b0f16c5 100644
--- a/app/views/committee/agenda_types/index.html.erb
+++ b/app/views/committee/agenda_types/index.html.erb
@@ -1,5 +1,5 @@
- <%= link_to_new new_agenda_type_path, t('.new_agenda_type_link') %>
+ <%= link_to_new t('.new_agenda_type_link'), new_agenda_type_path %>
@@ -9,7 +9,7 @@
<%= fa_icon 'tags', text: t('.card_header') %>
- <%= render 'components/smart_search_form',
+ <%= render 'layouts/shared/smart_search_form',
path: agenda_types_path,
placeholder: t('.name') %>
diff --git a/app/views/committee/agendas/index.html.erb b/app/views/committee/agendas/index.html.erb
index e14ab6f94..ec1fbe45b 100644
--- a/app/views/committee/agendas/index.html.erb
+++ b/app/views/committee/agendas/index.html.erb
@@ -1,5 +1,5 @@
- <%= link_to_new new_committee_agenda_path(@committee), t('.new_agenda_link') %>
+ <%= link_to_new t('.new_agenda_link'), new_committee_agenda_path(@committee) %>
<%= link_to(fa_icon('archive', text: t('.meetings')),
committee_meetings_path(@committee),
diff --git a/app/views/committee/dashboard/index.html.erb b/app/views/committee/dashboard/index.html.erb
index 24a1b124b..bfbfff881 100644
--- a/app/views/committee/dashboard/index.html.erb
+++ b/app/views/committee/dashboard/index.html.erb
@@ -1,7 +1,3 @@
-
- <%= link_to_new new_unit_path, t('.new_committee_link') %>
-
-
@@ -9,16 +5,14 @@
<%= fa_icon 'cubes', text: t('.card_header') %>
- <%= render 'components/smart_search_form',
+ <%= render 'layouts/shared/smart_search_form',
path: committees_path,
placeholder: t('.name') %>
<%= t('.name') %>
- <%= t('.yoksis_id') %>
<%= t('.detsis_id') %>
- <%= t('.unit_status') %>
<%= t('.unit_type') %>
<%= t('.district') %>
<%= t('actions') %>
@@ -27,10 +21,8 @@
<% @committees.each do |committee| %>
- <%= link_to(committee.name, unit_path(committee)) %>
- <%= committee.yoksis_id %>
+ <%= link_to(committee.names_depth_cache, unit_path(committee)) %>
<%= committee.detsis_id %>
- <%= committee.unit_status.name %>
<%= committee.unit_type.try(:name) %>
<%= committee.district.name %> / <%= committee.district.city.name %>
diff --git a/app/views/committee/decisions/show.html.erb b/app/views/committee/decisions/show.html.erb
index 25fb5c3cd..bd50ce0e2 100644
--- a/app/views/committee/decisions/show.html.erb
+++ b/app/views/committee/decisions/show.html.erb
@@ -39,7 +39,7 @@
diff --git a/app/views/committee/meetings/index.html.erb b/app/views/committee/meetings/index.html.erb
index ce8ac4ac6..86f5298cc 100644
--- a/app/views/committee/meetings/index.html.erb
+++ b/app/views/committee/meetings/index.html.erb
@@ -1,5 +1,5 @@
- <%= link_to_new new_committee_meeting_path(@committee), t('.new_committee_meeting_link') %>
+ <%= link_to_new t('.new_committee_meeting_link'), new_committee_meeting_path(@committee) %>
<%= link_to(fa_icon('tasks', text: t('.agendas')), committee_agendas_path(@committee),
class: 'btn btn-dark btn-sm') %>
diff --git a/app/views/committee/meetings/show.html.erb b/app/views/committee/meetings/show.html.erb
index 8fdea1c26..7ccb215d1 100644
--- a/app/views/committee/meetings/show.html.erb
+++ b/app/views/committee/meetings/show.html.erb
@@ -56,10 +56,10 @@
<%= agenda.decision.try(:decision_no) %>
<% if agenda.decision.present? %>
- <%= link_to_show(committee_meeting_agenda_decision_path(@committee, agenda, agenda.decision), t('.show_decision')) %>
- <%= link_to_edit(edit_committee_meeting_agenda_decision_path(@committee, agenda), t('.update_decision')) %>
+ <%= link_to_show(t('.show_decision'), committee_meeting_agenda_decision_path(@committee, agenda, agenda.decision)) %>
+ <%= link_to_edit(t('.update_decision'), edit_committee_meeting_agenda_decision_path(@committee, agenda)) %>
<% else %>
- <%= link_to_new(new_committee_meeting_agenda_decision_path(@committee, agenda), t('.create_decision')) %>
+ <%= link_to_new(t('.create_decision'), new_committee_meeting_agenda_decision_path(@committee, agenda)) %>
<% end %>
diff --git a/app/views/course_management/available_course_groups/_form.html.erb b/app/views/course_management/available_course_groups/_form.html.erb
new file mode 100644
index 000000000..cfb700a13
--- /dev/null
+++ b/app/views/course_management/available_course_groups/_form.html.erb
@@ -0,0 +1,40 @@
+
+
+
+
+
+ <%= simple_form_for([@available_course, @available_course_group]) do |f| %>
+
+
+ <%= f.error_notification %>
+
+
+ <%= f.input :name, required: true %>
+
+
+ <%= f.input :quota, required: true %>
+
+
+
+
<%= t('.lecturers') %>
+ <%= f.simple_fields_for :lecturers do |lecturer| %>
+ <%= render 'lecturer_fields', f: lecturer %>
+ <% end %>
+
+ <%= link_to_add_association f, :lecturers, class: 'btn btn-success btn-sm' %>
+
+
+
+ <%= f.button :submit, class: 'btn btn-outline-success btn-sm' %>
+ <%= link_to_back(:back) %>
+
+ <% end %>
+
+
+
+
+
+<%= javascript_include_tag 'shared/cocoon' %>
diff --git a/app/views/course_management/available_course_groups/_lecturer_fields.html.erb b/app/views/course_management/available_course_groups/_lecturer_fields.html.erb
new file mode 100644
index 000000000..116f5e3b4
--- /dev/null
+++ b/app/views/course_management/available_course_groups/_lecturer_fields.html.erb
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+ <%= f.association :lecturer, collection: @lecturers, label_method: lambda { |lecturer| full_name(lecturer) } %>
+
+
+ <%= f.input :coordinator, collection: [[t('yes'), true] ,[t('no'), false]] %>
+
+
+
+
+
+
+
diff --git a/app/views/course_management/available_course_groups/edit.html.erb b/app/views/course_management/available_course_groups/edit.html.erb
new file mode 100644
index 000000000..0d5fc7a31
--- /dev/null
+++ b/app/views/course_management/available_course_groups/edit.html.erb
@@ -0,0 +1,2 @@
+<%= render 'form', available_course_group: @available_course_group,
+ form_title: t('.form_title', course: @available_course.name) %>
diff --git a/app/views/course_management/available_course_groups/new.html.erb b/app/views/course_management/available_course_groups/new.html.erb
new file mode 100644
index 000000000..0d5fc7a31
--- /dev/null
+++ b/app/views/course_management/available_course_groups/new.html.erb
@@ -0,0 +1,2 @@
+<%= render 'form', available_course_group: @available_course_group,
+ form_title: t('.form_title', course: @available_course.name) %>
diff --git a/app/views/course_management/available_courses/_evaluation_types.html.erb b/app/views/course_management/available_courses/_evaluation_types.html.erb
new file mode 100644
index 000000000..53281ebc1
--- /dev/null
+++ b/app/views/course_management/available_courses/_evaluation_types.html.erb
@@ -0,0 +1,37 @@
+
+
+
+
+ <% @evaluation_types.each do |evaluation_type| %>
+
+
+
+
+ <%= t('.assessment_method') %>
+ <%= t('.percentage') %>
+
+
+
+ <% evaluation_type.course_assessment_methods.each do |assessment| %>
+
+ <%= assessment.name %>
+ <%= assessment.percentage %>
+
+ <% end %>
+
+
+ <% end %>
+
+
+
diff --git a/app/views/course_management/available_courses/_form.html.erb b/app/views/course_management/available_courses/_form.html.erb
new file mode 100644
index 000000000..f5292f1b9
--- /dev/null
+++ b/app/views/course_management/available_courses/_form.html.erb
@@ -0,0 +1,55 @@
+
+
+
+
+
+ <%= simple_form_for(@available_course) do |f| %>
+ <%= f.error_notification %>
+ <%= f.error_notification message: f.object.errors[:base].to_sentence if f.object.errors[:base].present? %>
+ <% if f.object.errors.any? %>
+
+ <% f.object.errors.full_messages.each do |message| %>
+
+ <%= message %>
+
+ <% end %>
+
+ <% end %>
+
+
+ <%= f.association :unit,
+ collection: Unit.active.coursable.order(:name),
+ label_method: :names_depth_cache %>
+
+
+ <%= f.association :curriculum,
+ collection: [*f.object.unit.try(:managed_curriculums)] %>
+
+
+ <%= f.association :coordinator,
+ collection: [*f.object.unit.try(:subtree_employees)],
+ label_method: lambda { |c| full_name(c) } %>
+
+
+ <% if f.object.curriculum %>
+ <% courses = CurriculumDecorator.new(f.object.curriculum)
+ .openable_courses_for_active_term(appends: f.object.course) %>
+ <% end %>
+ <%= f.association :course,
+ collection: [*courses] %>
+
+
+ <%= f.button :submit, class: 'btn btn-outline-success btn-sm' %>
+ <%= link_to_back(:back) %>
+
+
+ <% end %>
+
+
+
+
+
+<%= render 'js' %>
diff --git a/app/views/course_management/available_courses/_groups.html.erb b/app/views/course_management/available_courses/_groups.html.erb
new file mode 100644
index 000000000..fce2a95e4
--- /dev/null
+++ b/app/views/course_management/available_courses/_groups.html.erb
@@ -0,0 +1,43 @@
+
+
+
+
+ <% @groups.each do |group| %>
+
+
+
+
+ <%= t('.title') %>
+ <%= t('.lecturer') %>
+ <%= t('.coordinator') %>
+
+
+
+ <% group.lecturers.each do |lecturer| %>
+
+ <%= lecturer.title.name %>
+ <%= full_name(lecturer.identities.formal.first) %>
+ <%= icon_for_check(lecturer.coordinator) %>
+
+ <% end %>
+
+
+
+ <%= t('.quota')%> <%= group.quota %>
+
+ <% end %>
+
+
+
diff --git a/app/views/course_management/available_courses/_js.html.erb b/app/views/course_management/available_courses/_js.html.erb
new file mode 100644
index 000000000..72df1546f
--- /dev/null
+++ b/app/views/course_management/available_courses/_js.html.erb
@@ -0,0 +1,42 @@
+
diff --git a/app/views/course_management/available_courses/_search.html.erb b/app/views/course_management/available_courses/_search.html.erb
new file mode 100644
index 000000000..e98334816
--- /dev/null
+++ b/app/views/course_management/available_courses/_search.html.erb
@@ -0,0 +1,90 @@
+
+
+
diff --git a/app/views/course_management/available_courses/edit.html.erb b/app/views/course_management/available_courses/edit.html.erb
new file mode 100644
index 000000000..f7c434741
--- /dev/null
+++ b/app/views/course_management/available_courses/edit.html.erb
@@ -0,0 +1,2 @@
+<%= render 'form', available_course: @available_course,
+ form_title: t('.form_title', course: @available_course.name) %>
diff --git a/app/views/course_management/available_courses/index.html.erb b/app/views/course_management/available_courses/index.html.erb
new file mode 100644
index 000000000..21394d227
--- /dev/null
+++ b/app/views/course_management/available_courses/index.html.erb
@@ -0,0 +1,55 @@
+<%= render 'search' %>
+
+
+
+
+
+
+
+
+
+ <%= t('.unit') %>
+ <%= t('.academic_term') %>
+ <%= t('.curriculum') %>
+ <%= t('.course_code') %>
+ <%= t('.course') %>
+ <%= t('.group_count') %>
+ <%= t('.quota') %>
+ <%= t('actions') %>
+
+
+
+ <% @available_courses.each do |available_course| %>
+
+ <%= available_course.unit.name %>
+ <%= full_name(available_course.academic_term) %>
+ <%= available_course.curriculum.name %>
+ <%= available_course.course.code %>
+ <%= available_course.course.name %>
+ <%= available_course.groups_count %>
+ <%= available_course.groups.sum(:quota) %>
+
+ <%= link_to_show available_course %>
+ <%= link_to_edit [:edit, available_course] %>
+ <%= link_to_destroy available_course %>
+
+
+ <% end %>
+
+
+
+
+
+
+
diff --git a/app/views/course_management/available_courses/new.html.erb b/app/views/course_management/available_courses/new.html.erb
new file mode 100644
index 000000000..01c8515d7
--- /dev/null
+++ b/app/views/course_management/available_courses/new.html.erb
@@ -0,0 +1 @@
+<%= render 'form', available_course: @available_course, form_title: t('.form_title') %>
diff --git a/app/views/course_management/available_courses/show.html.erb b/app/views/course_management/available_courses/show.html.erb
new file mode 100644
index 000000000..1e4b33932
--- /dev/null
+++ b/app/views/course_management/available_courses/show.html.erb
@@ -0,0 +1,45 @@
+
+
+
+ <%= link_to_back available_courses_path %>
+ <%= link_to_edit edit_available_course_path(@available_course) %>
+ <%= link_to_destroy available_course_path(@available_course) %>
+
+
+
+
+
+
+
+
+ <%= t('.unit') %>
+ <%= @available_course.unit_name %>
+ <%= t('.curriculum') %>
+ <%= @available_course.curriculum_name %>
+
+
+ <%= t('.course') %>
+
+ <%= @available_course.name %>
+ T: <%= @available_course.theoric %>
+ P: <%= @available_course.practice %>
+ L: <%= @available_course.laboratory %>
+ K: <%= @available_course.credit %>
+
+ <%= t('.academic_term') %>
+ <%= full_name(@available_course.academic_term) %>
+
+
+ <%= t('.coordinator') %>
+ <%= full_name(@available_course.coordinator) %>
+
+
+
+
+ <%= render 'evaluation_types' %>
+ <%= render 'groups' %>
+
+
+
diff --git a/app/views/course_management/course_evaluation_types/_course_assessment_method_fields.html.erb b/app/views/course_management/course_evaluation_types/_course_assessment_method_fields.html.erb
new file mode 100644
index 000000000..966668242
--- /dev/null
+++ b/app/views/course_management/course_evaluation_types/_course_assessment_method_fields.html.erb
@@ -0,0 +1,17 @@
+
+
+
+
+
+ <%= f.association :assessment_method %>
+
+
+ <%= f.input :percentage, required: true %>
+
+
+
+
+
+
diff --git a/app/views/course_management/course_evaluation_types/_form.html.erb b/app/views/course_management/course_evaluation_types/_form.html.erb
new file mode 100644
index 000000000..843680f2a
--- /dev/null
+++ b/app/views/course_management/course_evaluation_types/_form.html.erb
@@ -0,0 +1,41 @@
+
+
+
+
+
+ <%= simple_form_for([:available_course, evaluation_type], url: url, method: method) do |f| %>
+
+
+ <%= f.error_notification %>
+ <%= f.error_notification message: f.object.errors[:base].to_sentence if f.object.errors[:base].present? %>
+
+
+ <%= f.association :evaluation_type %>
+
+
+ <%= f.input :percentage, required: true %>
+
+
+
<%= t('.assessment_methods') %>
+ <%= f.simple_fields_for :course_assessment_methods do |course_assessment| %>
+ <%= render 'course_assessment_method_fields', f: course_assessment %>
+ <% end %>
+
+ <%= link_to_add_association t('.create_assessment_method'), f, :course_assessment_methods, class: 'btn btn-outline-primary btn-sm' %>
+
+
+ <%= f.button :submit, class: 'btn btn-outline-success btn-sm' %>
+ <%= link_to_back(available_course_path(@available_course)) %>
+
+
+ <% end %>
+
+
+
+
+
+<%= javascript_include_tag 'shared/cocoon' %>
diff --git a/app/views/course_management/course_evaluation_types/edit.html.erb b/app/views/course_management/course_evaluation_types/edit.html.erb
new file mode 100644
index 000000000..0db94703e
--- /dev/null
+++ b/app/views/course_management/course_evaluation_types/edit.html.erb
@@ -0,0 +1,4 @@
+<%= render 'form', evaluation_type: @evaluation_type,
+ form_title: t('.form_title', course: @available_course.name),
+ url: available_course_evaluation_type_path(@available_course, @evaluation_type),
+ method: :patch %>
diff --git a/app/views/course_management/course_evaluation_types/new.html.erb b/app/views/course_management/course_evaluation_types/new.html.erb
new file mode 100644
index 000000000..11002c7aa
--- /dev/null
+++ b/app/views/course_management/course_evaluation_types/new.html.erb
@@ -0,0 +1,4 @@
+<%= render 'form', evaluation_type: @evaluation_type,
+ form_title: t('.form_title', course: @available_course.name),
+ url: available_course_evaluation_types_path(@available_course),
+ method: :post %>
diff --git a/app/views/course_management/course_group_types/index.html.erb b/app/views/course_management/course_group_types/index.html.erb
index a25dae61f..a659f4157 100644
--- a/app/views/course_management/course_group_types/index.html.erb
+++ b/app/views/course_management/course_group_types/index.html.erb
@@ -1,5 +1,5 @@
- <%= link_to_new new_course_group_type_path, t('.new_course_group_type_link') %>
+ <%= link_to_new t('.new_course_group_type_link'), new_course_group_type_path %>
@@ -9,7 +9,7 @@
<%= fa_icon 'tags', text: t('.card_header') %>
- <%= render 'components/smart_search_form',
+ <%= render 'layouts/shared/smart_search_form',
path: course_group_types_path,
placeholder: t('.name') %>
diff --git a/app/views/course_management/course_groups/_form.html.erb b/app/views/course_management/course_groups/_form.html.erb
index a18632a6e..ffb0fffbc 100644
--- a/app/views/course_management/course_groups/_form.html.erb
+++ b/app/views/course_management/course_groups/_form.html.erb
@@ -19,7 +19,7 @@
<%= f.association :unit,
- collection: Unit.active.without_programs.order(:name),
+ collection: Unit.active.academic.without_programs.order(:name),
label_method: :names_depth_cache %>
diff --git a/app/views/course_management/course_groups/_search.html.erb b/app/views/course_management/course_groups/_search.html.erb
new file mode 100644
index 000000000..7bb6d576f
--- /dev/null
+++ b/app/views/course_management/course_groups/_search.html.erb
@@ -0,0 +1,71 @@
+
+
+
diff --git a/app/views/course_management/course_groups/index.html.erb b/app/views/course_management/course_groups/index.html.erb
index 07f422deb..6e24a0f48 100644
--- a/app/views/course_management/course_groups/index.html.erb
+++ b/app/views/course_management/course_groups/index.html.erb
@@ -1,7 +1,9 @@
- <%= link_to_new new_course_group_path, t('.new_course_group_link') %>
+ <%= link_to_new t('.new_course_group_link'), new_course_group_path %>
+<%= render 'search' %>
+
@@ -9,9 +11,6 @@
<%= fa_icon 'tags', text: t('.card_header') %>
- <%= render 'components/smart_search_form',
- path: course_groups_path,
- placeholder: t('.search_placeholder') %>
diff --git a/app/views/course_management/course_types/index.html.erb b/app/views/course_management/course_types/index.html.erb
index 463fbc8b7..0a8c23ca6 100644
--- a/app/views/course_management/course_types/index.html.erb
+++ b/app/views/course_management/course_types/index.html.erb
@@ -1,5 +1,5 @@
- <%= link_to_new new_course_type_path, t('.new_course_type_link') %>
+ <%= link_to_new t('.new_course_type_link'), new_course_type_path %>
@@ -9,7 +9,7 @@
<%= fa_icon 'tags', text: t('.card_header') %>
- <%= render 'components/smart_search_form',
+ <%= render 'layouts/shared/smart_search_form',
path: course_types_path,
placeholder: t('.name') %>
diff --git a/app/views/course_management/courses/index.html.erb b/app/views/course_management/courses/index.html.erb
index 776fc30fb..c218cfd03 100644
--- a/app/views/course_management/courses/index.html.erb
+++ b/app/views/course_management/courses/index.html.erb
@@ -1,5 +1,5 @@
- <%= link_to_new new_course_path, t('.add_new_course') %>
+ <%= link_to_new t('.add_new_course'), new_course_path %>
<%= render 'search' %>
@@ -65,4 +65,4 @@
-
\ No newline at end of file
+
diff --git a/app/views/course_management/curriculum_course_groups/_form.html.erb b/app/views/course_management/curriculum_course_groups/_form.html.erb
index 8a2774b6a..d13207f07 100644
--- a/app/views/course_management/curriculum_course_groups/_form.html.erb
+++ b/app/views/course_management/curriculum_course_groups/_form.html.erb
@@ -6,37 +6,45 @@
<%= form_title %>
- <%= simple_form_for([@semester, @curriculum_course_group]) do |f| %>
+ <%= simple_form_for([@semester, curriculum_course_group]) do |f| %>
<%= f.error_notification %>
<%= f.association :course_group,
- collection: f.object.new_record? ? @semester.available_course_groups : [f.object.course_group] %>
+ collection: [f.object.course_group],
+ include_blank: false,
+ readonly: true %>
<%= f.input :ects %>
+
+
+
+
<%= t('.courses')%>
+
<%= f.simple_fields_for :curriculum_courses do |p| %>
<%= p.input :curriculum_semester_id, as: :hidden %>
- <%= p.association :course, collection: f.object.course_group.courses %>
+ <%= p.association :course,
+ collection: [ p.object.course ],
+ include_blank: false,
+ readonly: true %>
<%= p.input :ects %>
<% end %>
-
-
<%= f.button :submit, class: 'btn btn-outline-success btn-sm' %>
- <%= link_to_back(:back) %>
<% end %>
+ <%= link_to_back(:back) %>
+
+
+<%= render 'form', curriculum_course_group: @curriculum_course_group, form_title: t('.form_title') %>
diff --git a/app/views/course_management/curriculum_course_groups/new.html.erb b/app/views/course_management/curriculum_course_groups/new.html.erb
index b84819a40..4dcf56d6d 100644
--- a/app/views/course_management/curriculum_course_groups/new.html.erb
+++ b/app/views/course_management/curriculum_course_groups/new.html.erb
@@ -1 +1,33 @@
-<%= render 'form', semester_course: @semester_course, form_title: t('.form_title') %>
+
+ <%= link_to_back(:back) %>
+
+
+<% if @curriculum_course_groups %>
+
+
+
+
+ <% @curriculum_course_groups.each_with_index do |curriculum_course_group, index| %>
+
+ <%= render 'form', curriculum_course_group: curriculum_course_group, form_title: t('.form_title') %>
+
+ <% end %>
+
+
+ <%= link_to_back(:back) %>
+
+
- <%= simple_form_for([@semester, @curriculum_course]) do |f| %>
+ <%= simple_form_for([@semester, curriculum_course]) do |f| %>
<%= f.error_notification %>
- <%= f.association :course, collection: @semester.available_courses(appends: [@curriculum_course.course]) %>
+ <%= f.association :course,
+ collection: @semester.available_courses(appends: [curriculum_course.course]).sort_by(&:name) %>
-
\ No newline at end of file
+
+
+
diff --git a/app/views/course_management/curriculum_courses/edit.html.erb b/app/views/course_management/curriculum_courses/edit.html.erb
index b84819a40..1cea62bab 100644
--- a/app/views/course_management/curriculum_courses/edit.html.erb
+++ b/app/views/course_management/curriculum_courses/edit.html.erb
@@ -1 +1 @@
-<%= render 'form', semester_course: @semester_course, form_title: t('.form_title') %>
+<%= render 'form', curriculum_course: @curriculum_course, form_title: t('.form_title') %>
diff --git a/app/views/course_management/curriculum_courses/new.html.erb b/app/views/course_management/curriculum_courses/new.html.erb
index b84819a40..1cea62bab 100644
--- a/app/views/course_management/curriculum_courses/new.html.erb
+++ b/app/views/course_management/curriculum_courses/new.html.erb
@@ -1 +1 @@
-<%= render 'form', semester_course: @semester_course, form_title: t('.form_title') %>
+<%= render 'form', curriculum_course: @curriculum_course, form_title: t('.form_title') %>
diff --git a/app/views/course_management/curriculums/_curriculum_courses.html.erb b/app/views/course_management/curriculums/_curriculum_courses.html.erb
index 5f9129ced..dc05630dc 100644
--- a/app/views/course_management/curriculums/_curriculum_courses.html.erb
+++ b/app/views/course_management/curriculums/_curriculum_courses.html.erb
@@ -41,9 +41,6 @@
<% end %>
-
- <%= t('.total_ects') %>: <%= total_ects %>
-
+ <%= additional_info %>
<%= f.input :number_of_semesters,
collection: (1..Curriculum::MAX_NUMBER_OF_SEMESTERS),
- selected: 12,
+ selected: 8,
include_blank: false %>
@@ -42,24 +42,25 @@
selected: :periodic,
include_blank: false %>
- <% end %>
-
- <% unless curriculum.new_record? %>
- <%= t('.semesters') %>
-
+ <% else %>
+
+
+
<%= t('.semesters') %>
+
+
+
<%= f.simple_fields_for :semesters do |semester| %>
<%= render 'semester_fields', f: semester %>
<% end %>
-
- <%= link_to_add_association f, :semesters, class: 'btn btn-success btn-sm' %>
+
+
+ <%= link_to_add_association f, :semesters, class: 'btn btn-primary btn-sm pull-right' %>
+ <% end %>
+
+
+ <%= f.button :submit, class: 'btn btn-outline-success' %>
- <% end %>
-
-
- <%= f.button :submit, class: 'btn btn-outline-success btn-sm' %>
-
-
<% end %>
<%= label_tag(:unit_id, t('.unit')) %>
<%= select_tag(:unit_id,
- options_from_collection_for_select(Unit.active.departments.order(:name), :id, :name, params[:unit_id]),
+ options_from_collection_for_select(Unit.active.departments.order(:name), :id, :names_depth_cache, params[:unit_id]),
include_blank: true,
class: 'form-control') %>
diff --git a/app/views/course_management/curriculums/_semester_fields.html.erb b/app/views/course_management/curriculums/_semester_fields.html.erb
index 48ba7b8f9..a5cc0d319 100644
--- a/app/views/course_management/curriculums/_semester_fields.html.erb
+++ b/app/views/course_management/curriculums/_semester_fields.html.erb
@@ -1,19 +1,26 @@
-
-
-
-
-
-
- <%= f.input :sequence, collection: (1..Curriculum::MAX_NUMBER_OF_SEMESTERS), include_blank: false %>
-
-
- <%= f.input :year, collection: (1..Curriculum::MAX_NUMBER_OF_YEARS), include_blank: false %>
-
+
+
+
+ <%= link_to_remove_association f do %>
+ <%= button_tag('x', type: 'button', class: 'close', data: { confirm: t('are_you_sure') }) %>
+ <% end %>
+
+
+ <%= f.input :sequence,
+ collection: (1..Curriculum::MAX_NUMBER_OF_SEMESTERS),
+ include_blank: false %>
+
+
+ <%= f.input :year,
+ collection: (1..Curriculum::MAX_NUMBER_OF_YEARS),
+ include_blank: false %>
+
+
+ <%= f.input :term,
+ collection: enum_options_for_select(f.object.class, :term),
+ include_blank: false %>
-
-
-
\ No newline at end of file
+
diff --git a/app/views/course_management/curriculums/_semesters.html.erb b/app/views/course_management/curriculums/_semesters.html.erb
index c6ce8b2c1..3abcd5a28 100644
--- a/app/views/course_management/curriculums/_semesters.html.erb
+++ b/app/views/course_management/curriculums/_semesters.html.erb
@@ -3,10 +3,10 @@
@@ -16,32 +16,39 @@
actions: nil,
title: t('.compulsory_courses'),
semester: semester,
- courses: semester.curriculum_courses.compulsory,
- total_ects: semester.curriculum_courses.compulsory.sum(:ects),
- action_visible: true %>
+ courses: semester.curriculum_courses.compulsory.order('courses.name'),
+ action_visible: true,
+ additional_info: "
+ #{t('.total_ects')} #{semester.curriculum_courses.compulsory.sum(:ects)}
+
".html_safe
+ %>
<% semester.curriculum_course_groups.each do |curriculum_course_group| %>
<%= render 'curriculum_courses',
klass: 'border-warning',
actions: safe_join([
- link_to_edit(edit_curriculum_semester_curriculum_course_group_path(semester, curriculum_course_group)),
+ link_to_edit(edit_curriculum_semester_curriculum_course_group_path(semester, curriculum_course_group)),
link_to_destroy([semester, curriculum_course_group])
],
' '
),
title: "#{t('.elective_courses')} - #{curriculum_course_group.name}",
semester: semester,
- courses: curriculum_course_group.curriculum_courses,
- total_ects: curriculum_course_group.ects,
- action_visible: false %>
+ courses: curriculum_course_group.curriculum_courses.order('courses.name'),
+ action_visible: false,
+ additional_info: "
+ #{t('.selectable_total_ects')} #{curriculum_course_group.ects}
+
".html_safe %>
<% end %>
<% end %>
-
\ No newline at end of file
+
diff --git a/app/views/course_management/curriculums/index.html.erb b/app/views/course_management/curriculums/index.html.erb
index 576f74d9c..f27cff908 100644
--- a/app/views/course_management/curriculums/index.html.erb
+++ b/app/views/course_management/curriculums/index.html.erb
@@ -1,5 +1,5 @@
- <%= link_to_new new_curriculum_path, t('.add_new_curriculum') %>
+ <%= link_to_new t('.add_new_curriculum'), new_curriculum_path %>
<%= render 'search' %>
@@ -45,4 +45,4 @@
<%= t('devise.mailer.common.hello', mail: @email) %>
-<%= t('.body', support_mail: Rails.application.config.tenant.email.support) %>
+<%= t('.body', support_mail: Tenant.configuration.email.support) %>
<%= t('.new_mail', mail: @resource.email) %>
diff --git a/app/views/devise/mailer/password_change.html.erb b/app/views/devise/mailer/password_change.html.erb
index c8d8f1c70..125d79ce1 100644
--- a/app/views/devise/mailer/password_change.html.erb
+++ b/app/views/devise/mailer/password_change.html.erb
@@ -1,2 +1,2 @@
<%= t('devise.mailer.common.hello', mail: @resource.email) %>
-<%= t('.body', support_mail: Rails.application.config.tenant.email.support) %>
+<%= t('.body', support_mail: Tenant.configuration.email.support) %>
diff --git a/app/views/documents/_form.html.erb b/app/views/documents/_form.html.erb
deleted file mode 100644
index bb3a76893..000000000
--- a/app/views/documents/_form.html.erb
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
-
-
- <%= simple_form_for(document) do |f| %>
-
-
- <%= f.error_notification %>
-
-
- <%= f.input :name, required: true %>
-
-
- <%= f.input :statement %>
-
-
- <%= f.button :submit, class: 'btn btn-outline-success btn-sm' %>
- <%= link_to_back(:back) %>
-
-
- <% end %>
-
-
-
-
- <%= link_to_new(new_document_path, t('.new_document_link')) %>
-
-
-
-
-
-
-
-
-
-
- <%= t('.name') %>
- <%= t('.statement') %>
- <%= t('actions') %>
-
-
-
- <% @documents.each do |document| %>
-
- <%= document.name %>
- <%= document.statement %>
-
- <%= link_to_show(document_path(document)) %>
- <%= link_to_edit(edit_document_path(document)) %>
- <%= link_to_destroy(document) %>
-
-
- <% end %>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- <%= t('.name') %>
- <%= @document.name %>
-
-
- <%= t('.statement') %>
- <%= @document.statement %>
-
-
-
-
-
-
-
+
+
+
+
+ <%= render 'search' %>
+
+
+
+ <%= t('.id_number') %>
+ <%= t('.first_name') %>
+ <%= t('.last_name') %>
+ <%= t('.unit') %>
+ <%= t('.meb_status') %>
+ <%= t('.military_status') %>
+ <%= t('.obs_status') %>
+ <%= t('.student_entrance_type') %>
+ <%= t('actions') %>
+
+
+
+ <% @prospective_students.each do |prospective_student| %>
+
+ <%= prospective_student.id_number %>
+ <%= prospective_student.first_name %>
+ <%= prospective_student.last_name %>
+ <%= prospective_student.unit.name %>
+ <%= prospective_student.meb_status ? t('.graduated') : t('.not_graduated_or_unknown') %>
+ <%= prospective_student.military_status ? t('.unproblematic') : t('.must_see_recruiting_office') %>
+ <%= prospective_student.obs_status ? t('.unproblematic') : t('.student_in_a_different_unit') %>
+ <%= prospective_student.student_entrance_type.try(:name) %>
+
+ <%= link_to_show([:first_registration, prospective_student]) %>
+
+
+ <% end %>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <%= t('.student_entrance_type') %>
+ <%= @prospective_student.student_entrance_type.try(:name) %>
+
+
+ <%= t('.unit') %>
+ <%= @prospective_student.unit.names_depth_cache %>
+
+
+ <%= t('.meb_status') %>
+
+ <%= @prospective_student.meb_status ? t('.graduated') : t('.not_graduated_or_unknown') %>
+ <%= t('.last_update') %>: <%= as_date_and_time(@prospective_student.meb_status_date) %>
+
+
+
+ <%= t('.military_status') %>
+
+ <%= @prospective_student.military_status ? t('.unproblematic') : t('.must_see_recruiting_office') %>
+ <%= t('.last_update') %>: <%= as_date_and_time(@prospective_student.military_status_date) %>
+
+
+
+ <%= t('.obs_status') %>
+
+ <%= @prospective_student.obs_status ? t('.unproblematic') : t('.student_in_a_different_unit') %>
+ <%= t('.last_update') %>: <%= as_date_and_time(@prospective_student.obs_status_date) %>
+ <% if @prospective_student.obs_registered_program %>
+
+ <%= fa_icon 'exclamation-triangle' %>
+ <%= t('.registered_to', program: @prospective_student.obs_registered_program) %>
+
+ <% end %>
+
+
+ <% unless @prospective_student.registered %>
+ <% @prospective_student.unit.registration_documents.each do |registration_document| %>
+
+ <%= registration_document.name %>
+
+
+
+
+
+ <% end %>
+ <% end %>
+
+
+
+
+ <% unless @prospective_student.registered %>
+
+ <% end %>
+
+
+
+
+
+
+
+
+
+ <%= t('.id_number') %>
+ <%= @prospective_student.id_number %>
+
+
+ <%= t('.first_name') %>
+ <%= @prospective_student.first_name %>
+
+
+ <%= t('.last_name') %>
+ <%= @prospective_student.last_name %>
+
+
+ <%= t('.date_of_birth') %>
+ <%= @prospective_student.date_of_birth %>
+
+
+ <%= t('.fathers_name') %>
+ <%= @prospective_student.fathers_name %>
+
+
+ <%= t('.mothers_name') %>
+ <%= @prospective_student.mothers_name %>
+
+
+ <%= t('.gender') %>
+ <%= enum_t(@prospective_student, :gender) %>
+
+
+ <%= t('.nationality') %>
+ <%= @prospective_student.nationality %>
+
+
+ <%= t('.place_of_birth') %>
+ <%= @prospective_student.place_of_birth %>
+
+
+ <%= t('.registration_city') %>
+ <%= @prospective_student.registration_city %>
+
+
+ <%= t('.registration_district') %>
+ <%= @prospective_student.registration_district %>
+
+
+ <%= t('.state_of_education') %>
+ <%= @prospective_student.state_of_education %>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <%= t('.high_school_code') %>
+ <%= @prospective_student.high_school_code %>
+
+
+ <%= t('.high_school_type') %>
+ <%= @prospective_student.high_school_type.try(:name) %>
+
+
+ <%= t('.high_school_graduation_year') %>
+ <%= @prospective_student.high_school_graduation_year %>
+
+
+ <%= t('.placement_type') %>
+ <%= enum_t(@prospective_student, :placement_type) %>
+
+
+ <%= t('.exam_score') %>
+ <%= @prospective_student.exam_score %>
+
+
+ <%= t('.language_id') %>
+ <%= @prospective_student.language_id %>
+
+
+ <%= t('.address') %>
+ <%= @prospective_student.address %>
+
+
+ <%= t('.home_phone') %>
+ <%= @prospective_student.home_phone %>
+
+
+ <%= t('.mobile_phone') %>
+ <%= @prospective_student.mobile_phone %>
+
+
+ <%= t('.email') %>
+ <%= @prospective_student.email %>
+
+
+ <%= t('.student_disability_type_id') %>
+ <%= @prospective_student.student_disability_type_id %>
+
+
+ <%= t('.top_student') %>
+ <%= @prospective_student.top_student ? t('yes') : t('no') %>
+
+
+ <%= t('.placement_score') %>
+ <%= @prospective_student.placement_score %>
+
+
+ <%= t('.placement_rank') %>
+ <%= @prospective_student.placement_rank %>
+
+
+ <%= t('.preference_order') %>
+ <%= @prospective_student.preference_order %>
+
+
+ <%= t('.placement_score') %>
+ <%= @prospective_student.placement_score %>
+
+
+ <%= t('.additional_score') %>
+ <%= @prospective_student.additional_score %>
+
+
+
+
+
+
+
+
+
+
+
+ <%= render 'layouts/shared/smart_search_form',
+ path: [:first_registration, :registration_documents],
+ placeholder: t('.placeholder') %>
+
+
+
+ <%= t('.academic_term_id') %>
+ <%= t('.unit_id') %>
+ <%= t('.document_type_id') %>
+ <%= t('.description') %>
+ <%= t('actions') %>
+
+
+
+ <% @registration_documents.each do |registration_document| %>
+
+ <%= full_name(registration_document.academic_term) %>
+ <%= registration_document.unit.name %>
+ <%= registration_document.document_type.name %>
+ <%= registration_document.description %>
+
+ <%= link_to_edit([:edit, :first_registration, registration_document]) %>
+ <%= link_to_destroy([:first_registration, registration_document]) %>
+
+
+ <% end %>
+
+
+
+
+
+
+
+
+
+
+
+
+ <%= simple_form_for([namespace.try(:to_sym), klass].flatten) do |f| %>
+
+
+ <%= f.error_notification %>
+ <%= f.error_notification message: f.object.errors[:base].to_sentence if f.object.errors[:base].present? %>
+
+ <% params.each do |parameter| %>
+ <%= content_tag :div, class: "form-group col-sm-#{parameter[:width]}" do %>
+ <%= f.input parameter[:field].to_sym,
+ as: parameter[:as].try(:to_sym),
+ required: parameter[:required] || false,
+ collection: parameter[:collection],
+ label: parameter[:label],
+ inline_label: parameter[:inline_label],
+ hint: parameter[:hint],
+ placeholder: parameter[:placeholder],
+ prompt: parameter[:promt],
+ disabled: parameter[:disabled] || false,
+ start_year: parameter[:start_year],
+ end_year: parameter[:end_year],
+ discard_day: parameter[:discard_day],
+ label_method: parameter[:label_method].try(:to_sym),
+ value_method: parameter[:value_method].try(:to_sym),
+ group_method: parameter[:group_method].try(:to_sym),
+ group_label_method: parameter[:group_label_method].try(:to_sym) %>
+ <% end %>
+ <% end %>
+
+ <%= f.button :submit, class: 'btn btn-outline-success btn-sm' %>
+ <%= link_to_back(:back) %>
+
+
+ <% end %>
+
+
+
+
+
+
+
+
+ <%= render 'layouts/shared/smart_search_form',
+ path: "#{klass.tableize}",
+ placeholder: t("#{namespace}.#{klass.pluralize}.index.name") %>
+
+
+
+ <% params.each do |parameter| %>
+ <%= content_tag :th do %>
+ <%= t("#{namespace}.#{klass.pluralize}.index.#{parameter}") %>
+ <% end %>
+ <% end %>
+ <%= t('actions') %>
+
+
+
+ <% collection.each do |item| %>
+
+ <% params.each do |parameter| %>
+ <% value = item.send(parameter) %>
+ <%= content_tag :td do %>
+ <% enum = item.class.defined_enums.has_key?(parameter) %>
+ <% boolean = [true, false].include?(value) %>
+ <%= (boolean || enum) ? enum_t(item, parameter.to_sym) : value %>
+ <% end %>
+ <% end %>
+
+ <%= link_to_show([namespace.to_sym, item]) if actions.include? 'show' %>
+ <%= link_to_edit([:edit, namespace.to_sym, item]) if actions.include? 'edit' %>
+ <%= link_to_destroy([namespace.to_sym, item]) if actions.include? 'destroy' %>
+
+
+ <% end %>
+
+
+
+
+
+
+
+
+
- Ondokuz Mayıs Üniversitesi, Kurupelit Kampüsü, Atakum/SAMSUN, +9 0362 312 1919
+ <%= Tenant.configuration.contact.address %>, <%= Tenant.configuration.contact.phone %>
@@ -133,4 +133,4 @@