Commit cdf93832 authored by Odair M.'s avatar Odair M.
Browse files

Closes #157: renomeia uploads para submission e move pasta script para submission/analysis

parent 0733528c
Pipeline #19185 passed with stage
in 15 seconds
from django.core.management.base import BaseCommand
from uploads.models import Submission
from submission.models import Submission
from script.main import analyze
from submission.analysis.main import analyze
class Command(BaseCommand):
......
......@@ -52,7 +52,7 @@ INSTALLED_APPS = [
'course',
'student',
'report_api',
'uploads'
'submission'
]
MIDDLEWARE_CLASSES = [
......@@ -170,7 +170,7 @@ else:
STATIC_ROOT = os.path.join(PROJECT_DIR, 'static')
MEDIA_URL = '/script/base/'
MEDIA_ROOT = os.path.join(PROJECT_DIR, 'uploads')
MEDIA_ROOT = os.path.join(PROJECT_DIR, 'submission')
# MEDIA_URL = None # a gente não quer ninguem fazendo download disso
# MEDIA_ROOT = os.path.join(PROJECT_DIR, 'uploads')
......@@ -10,8 +10,8 @@
submetidos e processados</b> referentes aos cursos registrados no sistema. Caso não exista nenhum
relatório processado relacionado aos cursos, o sistema acusará um erro.
<a href="{% url 'uploads:SubmissionCreateView' %}">Submeter relatório</a></a>,
que podem ser gerenciados na página <a href="{% url 'uploads:SubmissionListView' %}"> Gerenciar relatórios</a>.
<a href="{% url 'submission:SubmissionCreateView' %}">Submeter relatório</a></a>,
que podem ser gerenciados na página <a href="{% url 'submission:SubmissionListView' %}"> Gerenciar relatórios</a>.
<br><br>
......
......@@ -30,7 +30,7 @@
<a href="{% url 'dashboard' %}">Início</a>
</span>
<span class="navbar-text">
<a href="{% url 'uploads:SubmissionListView' %}">Relatórios</a>
<a href="{% url 'submission:SubmissionListView' %}">Relatórios</a>
</span>
&nbsp;&nbsp;&nbsp;
{% comment %}
......
<div class="sidebar left hidden-sm hidden-xs">
<li><a class="btn btn-primary text-left" href="{% url 'uploads:SubmissionListView' %}">Gerenciar relatórios</a></li>
<li><a class="btn btn-primary text-left" href="{% url 'submission:SubmissionListView' %}">Gerenciar relatórios</a></li>
<li><a class="btn btn-primary text-left" href="{% url 'degree:index' submission_id=submission.id%}">Informações gerais do curso</a></li>
<li><a class="btn btn-primary text-left" href="{% url 'student:index' submission_id=submission.id%}">Alunos</a></li>
<li style="display: block;">
......
......@@ -15,7 +15,7 @@ urlpatterns = [
url(r'^adega/course/(?P<submission_id>\w*)/', include('course.urls', namespace='course')),
url(r'^adega/submission/', include('uploads.urls', namespace='uploads')),
url(r'^adega/submission/', include('submission.urls', namespace='submission')),
url(r'^adega/student/(?P<submission_id>\w*)/', include('student.urls', namespace='student')),
......
from django.shortcuts import render, redirect
from django.contrib.auth.decorators import login_required
from django.contrib.auth import logout as process_logout
from uploads.models import Submission
from submission.models import Submission
......@@ -19,9 +19,10 @@ def dashboard(request):
"code": degree.code,
"last_submission": last_submission
})
return render(request, 'adega/dashboard.html', {'title': 'Dashboard',
"degrees_last_submissions":degrees_last_submissions, "hide_navbar": True
})
return render(request, 'adega/dashboard.html', {"title": "Dashboard",
"degrees_last_submissions":degrees_last_submissions,
"hide_navbar": True
})
@login_required
......
......@@ -5,7 +5,7 @@ from django.contrib import messages
from degree.models import Degree
from report_api.views import get_list_admission, get_admission_detail
from uploads.models import Submission
from submission.models import Submission
def detail(request, submission_id, ano, semestre):
......
......@@ -5,7 +5,7 @@ from django.contrib import messages
from degree.models import Degree
from report_api.views import get_list_courses, get_course_detail
from uploads.models import Submission
from submission.models import Submission
def detail(request, submission_id, codigo_disciplina):
......
......@@ -2,5 +2,5 @@ from django.conf.urls import url
from degree import views
urlpatterns = [
url(r'^$',views.index, name='index')
url(r'^$', views.index, name='index')
]
......@@ -4,7 +4,7 @@ from django.contrib.auth.decorators import login_required
from django.contrib.auth import logout as process_logout
from report_api.views import get_degree_information
from degree.models import Degree
from uploads.models import Submission
from submission.models import Submission
import json
......
from degree.models import Degree
from uploads.models import Submission
from submission.models import Submission
import json
def get_data(session, degree, data_name, submission_id=None):
......
......@@ -8,7 +8,7 @@ from report_api.views import get_list_students, get_student_detail
import json
from uploads.models import Submission
from submission.models import Submission
def detail(request, submission_id, grr):
submission_id = int(submission_id)
......
from django.contrib import admin
from .models import Submission
from submission.models import Submission
from script.main import analyze
from submission.analysis.main import analyze
from traceback import print_exc
......
import numpy as np
from script.utils.situations import Situation as sit
from script.utils.situations import EvasionForm as ef
from script.utils.situations import *
from script.utils.situations import Situation as sit
from script.utils.situations import EvasionForm as ef
from script.analysis.student_analysis import StudentAnalysis
from submission.analysis.utils.situations import Situation as sit
from submission.analysis.utils.situations import EvasionForm as ef
from submission.analysis.utils.situations import *
from submission.analysis.utils.situations import Situation as sit
from submission.analysis.utils.situations import EvasionForm as ef
from submission.analysis.analysis.student_analysis import StudentAnalysis
from collections import defaultdict
import numpy as np
......
# -*- coding: utf-8 -*-
import numpy as np
from script.utils.situations import Situation as sit
from submission.analysis.utils.situations import Situation as sit
from collections import namedtuple
"""
Rate é uma tupla nomeada(deixa mais legivel fazer rate.name do que rate[0]) o
......
......@@ -3,7 +3,7 @@ their academic record canceled."""
import numpy as np
import pandas as pd
import pprint
from script.utils.situations import *
from submission.analysis.utils.situations import *
fails_by_course = [10] # used at: student_three_fails_course
......
# -*- coding: utf-8 -*-
from script.utils.situations import Situation as sit
from script.analysis.analysis import Analysis, rate, mean
from submission.analysis.utils.situations import Situation as sit
from submission.analysis.analysis.analysis import Analysis, rate, mean
import numpy as np
......
import pandas as pd
import math
import json
from script.utils.situations import Situation, EvasionForm
import pandas as pd
from submission.analysis.utils.situations import Situation, EvasionForm
def average_graduation(df):
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment