Skip to content
This repository was archived by the owner on Apr 6, 2021. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Untitled
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
options: {scales: {xAxes: [{display: false} ] } }
3 changes: 3 additions & 0 deletions app/assets/javascripts/application.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@
//= require jquery_ujs
//= require jquery.slick
//= require noty/lib/noty
//= require bulma-slider/slider
//= require Chart.bundle
//= require chartkick
//= require turbolinks
//= require_tree .
$( function() {
Expand Down
3 changes: 0 additions & 3 deletions app/assets/javascripts/lessons.coffee

This file was deleted.

Empty file.
3 changes: 0 additions & 3 deletions app/assets/javascripts/main.coffee

This file was deleted.

1 change: 1 addition & 0 deletions app/assets/javascripts/main.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
//= require jquery.easy-pie-chart
1 change: 1 addition & 0 deletions app/assets/stylesheets/application.scss
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
@import "font-awesome-sprockets";
@import "font-awesome";
@import 'slick';
@import 'bulma-slider/slider';

//Mixins
@mixin vertical-alignment($position: relative) {
Expand Down
69 changes: 69 additions & 0 deletions app/assets/stylesheets/lessons.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@
// They will automatically be included in application.css.
// You can use Sass (SCSS) here: http://sass-lang.com/
//Mixins
@import 'bulma';
@import 'bulma-tooltip/tooltip';
@import 'jquery.easy-pie-chart';
@mixin vertical-alignment($position: relative) {
position: $position;
top: 50%;
Expand All @@ -14,3 +17,69 @@
list-style: none !important;
padding-left: 0 !important;
}
.grader{
min-height: 600px;
h5.subtitle{
font-size: 1rem;
}
}

#grades_submit{
margin-right: -20px;
position: fixed;
bottom: 30px;
right: 30px;
cursor: pointer;
z-index: 999;
box-shadow: 0px 2px 5px #666;
}
nav.level.stats{
margin: 10px;
}

hr.major {
height: 10px;
border-style: solid;
border-color: $light;
border-width: 1px 0 0 0;
border-radius: 20px;
background-color: darken($light, 10%);
}
hr.major:before {
display: block;
content: "";
height: 30px;
margin-top: -31px;
border-style: solid;
border-color: $light;
border-width: 0 0 1px 0;
border-radius: 20px;
}

#status-table{
border-radius: 10px;
text-align: center;
}

strong.bright{
background-color: $light;
border-radius: 10px;
border: 2px solid $grey;
padding: 5px 10px 5px 10px;
}
.box-container{
display: flex !important;
align-items: center;
.box{
h3{
font-size: 20px;
font-weight: 800;
letter-spacing: 2px;
padding: 10px 0 10px 0;
}
width: 90%;
height: 90%;
align-self: center;
margin: auto;
}
}
6 changes: 6 additions & 0 deletions app/assets/stylesheets/main.scss
Original file line number Diff line number Diff line change
Expand Up @@ -46,3 +46,9 @@
margin-bottom: 10px;
}
}

.columns.has-equal-heights{
&:last-child{
margin-right: 20px;
}
}
10 changes: 10 additions & 0 deletions app/controllers/application_controller.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
class ApplicationController < ActionController::Base
protect_from_forgery with: :exception
layout :layout_by_resource

# choose different layout for devise
def layout_by_resource
if devise_controller?
'devise'
else
'application'
end
end
end
43 changes: 22 additions & 21 deletions app/controllers/lessons_controller.rb
Original file line number Diff line number Diff line change
@@ -1,51 +1,52 @@
class LessonsController < ApplicationController
def index; end

def new
@lessons = Lesson.all
before_action :authenticate_user!
def index
@list = current_user.lessons.where(selected: true).group_by(&:semester)
end

def semesters
@semesters = Lesson.where(selected: true).group_by(&:semester)
end
def grades; end

def show_semester
@semesters = Lesson.where(selected: true).group_by(&:semester)
@semester = @semesters[params[:id].to_i]
@semesters = current_user.lessons.where(selected: true)
.group_by(&:semester)[params[:id].to_i]
end

def stats; end
def status; end

def stats
@lessons = current_user.lessons.where(selected: true)
end

def add
@basics = Lesson.where(ltype: 2)
@generals = Lesson.where(ltype: 3)
@specials = Lesson.where(ltype: 4)
@thesis = Lesson.where(ltype: 5)
@basics = current_user.lessons.where(ltype: 2)
@generals = current_user.lessons.where(ltype: 3)
@specials = current_user.lessons.where(ltype: 4)
@thesis = current_user.lessons.where(ltype: 5)
end

def submit_grades
Lesson.all.each do |les|
current_user.lessons.all.each do |les|
@grade = params[les.name]
les.update_attribute(:grade, @grade)
end
redirect_to action: 'index'
end

def select
@les = Lesson.find(params[:lesson])
@les = current_user.lessons.find(params[:lesson])
@les.update_attribute(:selected, true) unless @les.selected
redirect_to action: 'add'
end

def delete
@basics = Lesson.where(ltype: 2, selected: true)
@generals = Lesson.where(ltype: 3, selected: true)
@specials = Lesson.where(ltype: 4, selected: true)
@thesis = Lesson.where(ltype: 5, selected: true)
@basics = current_user.lessons.where(ltype: 2, selected: true)
@generals = current_user.lessons.where(ltype: 3, selected: true)
@specials = current_user.lessons.where(ltype: 4, selected: true)
@thesis = current_user.lessons.where(ltype: 5, selected: true)
end

def remove
@les = Lesson.find(params[:lesson])
@les = current_user.lessons.find(params[:lesson])
@les.update_attribute(:selected, false) if @les.selected
redirect_to action: 'new'
end
Expand Down
84 changes: 77 additions & 7 deletions app/helpers/lessons_helper.rb
Original file line number Diff line number Diff line change
@@ -1,38 +1,108 @@
module LessonsHelper
def avg_calc
@lessons = Lesson.where(grade: [5..10], selected: true)
@lessons = current_user.lessons.where(grade: [5..10], selected: true)
@sum = 0
@lessons.each do |les|
@sum += les.ects * les.grade.to_f
end
@avg = @sum / @lessons.sum(:ects) unless @lessons.sum(:ects).zero?
end

def avg_color
case avg_calc
when 5..6
'has-text-info'
when 6.01..7
'has-text-primary'
when 7.01..8
'has-text-warning'
when 8.01..10
'has-text-success'
end
end

def sem_avg(i)
Lesson.where(semester: i, grade: [5..10]).average(:grade).to_s.first(4)
current_user.lessons.where(semester: i, grade: [5..10]).average(:grade)
end

def avg_winter_semesters
@sum = 0
for i in 1..8
@sum += sem_avg(i) if i.odd?
end
@sum / 4.0
end

def avg_summer_semesters
@sum = 0
for i in 1..8
@sum += sem_avg(i) if i.even?
end
@sum / 4.0
end

def category_avg
@cats = current_user.lessons.map { |l| l.code.first(3) }.uniq
@averages = {}
@samps = []
@cats.each do |cat|
current_user.lessons.where(selected: true, grade: [5..10]).each { |les| @samps << les if les.code.first(3) == cat }
@averages[cat] = arr_avg(@samps)
end
@averages
end

def arr_avg(arr)
@sum = 0
arr.each { |les| @sum += les.grade }
@sum.to_f / arr.count
end

def avg_std
current_user.lessons.where(ltype: 1, grade: [5..10]).average(:grade)
end

def avg_basic
current_user.lessons.where(ltype: 2, grade: [5..10]).average(:grade)
end

def avg_gen
current_user.lessons.where(ltype: 3, grade: [5..10]).average(:grade)
end

def avg_sp
current_user.lessons.where(ltype: 4, grade: [5..10]).average(:grade)
end

# Obligatory Classes
def oblig_count
Lesson.where(grade: [5..10], ltype: 1).count
current_user.lessons.where(grade: [5..10], ltype: 1).count
end

# Basic Selection Classes
def basic_ch_count
Lesson.where(grade: [5..10], ltype: 2).count
current_user.lessons.where(grade: [5..10], ltype: 2).count
end

# General Selection Classes
def gen_ch_count
Lesson.where(grade: [5..10], ltype: 3).count
current_user.lessons.where(grade: [5..10], ltype: 3).count
end

# Special Selection Classes
def spe_ch_count
Lesson.where(grade: [5..10], ltype: 4).count
current_user.lessons.where(grade: [5..10], ltype: 4).count
end

def th_count
Lesson.where(grade: [5..10], ltype: 5).count
current_user.lessons.where(grade: [5..10], ltype: 5).count
end

def passed
current_user.lessons.where(grade: [5..10], selected: true)
end

def icon_generator(cat)
cat ? 'check-square-o has-text-success' : 'times has-text-warning'
end
end
24 changes: 6 additions & 18 deletions app/models/lesson.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,23 +10,11 @@ def default_values
end
end

def self.thesis?
Lesson.where(type: 5, grade: [5..10], selected: true).count == 1
end

def basics?
Lesson.where(type: 2, grade: [5..10]).count > 3
end

def generals?
Lesson.where(type: 2, grade: [5..10]).count > 1
end

def specials?
Lesson.where(type: 3, grade: [5..10]).count > 1
end

def self.no_thesis?
Lesson.where(type: [2..3], grade: [5..10]).count > 5 unless thesis?
def passed?
if grade > 4
true
else
false
end
end
end
2 changes: 2 additions & 0 deletions app/models/subject.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
class Subject < ApplicationRecord
end
Loading