Merge branch '161-erro-ao-submeter-novos-relatorios' into 'development'

Resolve "Fix bug on degree avarage graduation time analysis"

Closes #161

See merge request !63

.gitignore

+*/.vscode/
+.vscode/
+
 # info de contas criadas no sistema
 login_info
 # base de dados

src/degree/views.py

@@ -13,11 +13,12 @@ def index(request, submission_id):
     submission_id = int(submission_id)
 
     submission = Submission.objects.get(id=submission_id)
+
     degree = submission.degree
 
 
     if not (degree in request.user.educator.degree.all()):
-        return redirect("adega:dashboard")
+        return redirect("dashboard")
 
     degree_data = get_degree_information(request.session,degree, submission_id=submission_id)
     return render(request,"degree/index.html",{

src/submission/analysis/analysis/degree_analysis.py

@@ -88,14 +88,24 @@ def average_graduation_time(df):
     total_graduate = graduates.shape[0]
     average_time = 0
     year_end = int(df['ANO'].max())
-    semester_end = graduates['PERIODO'].max()
     for index, row in graduates.iterrows():
         if pd.notnull(row['ANO_EVASAO']):
             year_end = int(row['ANO_EVASAO'])
             try: 
                 semester_end = int(row['SEMESTRE_EVASAO'])
             except ValueError:
-                semester_end = graduates['PERIODO'].max()
+                try:
+                    evasion_dt = int(row["DT_EVASAO"].split("/")[1])
+                    if(evasion_dt > 7):
+                        semester_end = 2
+                    else:
+                        semester_end = 1
+                except ValueError:
+                    # TODO: Some students will be not considered
+                    # The interface must inform the user this information
+                    # and how many students wasnt considered
+                    continue
+
         year = int(row['ANO_INGRESSO'])
         semester = int(row['SEMESTRE_INGRESSO'])
         difference = 2 * (year_end - year) + (semester_end - semester) + 1

src/submission/analysis/base/dataframe_base.py

@@ -80,7 +80,7 @@ def clean_history(df):
 
     df.drop(drop_columns, axis=1, inplace=True)
 
-    df['PERIODO'] = df['PERIODO'].str.split('o').str[0]
+    # df['PERIODO'] = df['PERIODO'].str.split('o').str[0]
 
 
 def clean_register(df):

src/submission/analysis/main.py

@@ -6,9 +6,6 @@ from datetime import timedelta
 
 
 def analyze(submission, debug=True):
-    print(submission.path())
-
-
     start_time = time.clock()
     start_time_exec = time.time()
     try: