Parcourir la source

[added] Feedback on weekly progrees for uni classes added in journal.

bgkjdgbizgblzdgbr il y a 3 mois
Parent
commit
eb7ef09e48
1 fichiers modifiés avec 43 ajouts et 5 suppressions
  1. 43 5
      locations/journal.qsrc

+ 43 - 5
locations/journal.qsrc

@@ -654,20 +654,58 @@ if $ARGS[0] = 'uni':
 		j = 0
 		:grade_loop
 			if $class_list_institution[j] = 'uni_<<$university[''enrolled_in'']>>_semester_<<university[''enrolled_in_semester'']>>':
-				if     dyneval( 'RESULT = class[''<<$class_list_institution[j]>>_<<$class_list_name[j]>>_grade'']') >= dyneval( 'RESULT = (4*<<university[''semester_week'']>> + 32)'):
+				if dyneval( 'RESULT = class[''<<$class_list_institution[j]>>_<<$class_list_name[j]>>_grade'']') >= dyneval( 'RESULT = (3*<<university[''semester_week'']>> + 52)'):
 					'You think you''re doing great in <<$class_list_name[j]>> and will probably pass with a top grade if you keep this up.'
-
+					if dyneval ('RESULT = class[''<<$class_list_institution[j]>>_<<$class_list_name[j]>>_weekly_grade_gain''] +  class[''<<$class_list_institution[j]>>_<<$class_list_name[j]>>_optional_weekly_grade_gain'']') < dyneval('RESULT = class[''<<$class_list_institution[j]>>_<<$class_list_name[j]>>_weekly_grade_gain_breakeven_point'']'):
+						'So far you have not done enough work this week an if you don''t go to more classes and are active there or study more outside classes, you will not just fail to keep up, you will actually make your chances of getting good grade  worse.'
+					elseif dyneval ('RESULT = 3*(class[''<<$class_list_institution[j]>>_<<$class_list_name[j]>>_weekly_grade_gain''] +  class[''<<$class_list_institution[j]>>_<<$class_list_name[j]>>_optional_weekly_grade_gain''] -  class[''<<$class_list_institution[j]>>_<<$class_list_name[j]>>_weekly_grade_gain_breakeven_point''])') < dyneval('RESULT = 3*(class[''<<$class_list_institution[j]>>_<<$class_list_name[j]>>_weekly_grade_gain_max''] - class[''<<$class_list_institution[j]>>_<<$class_list_name[j]>>_weekly_grade_gain_breakeven_point''])'):
+						'The work you have put in this week so far is not enough to keep up, but at least you are not falling to much behind.'
+					else
+						'You have so far put in the amount of work this week to keep up.'
+					end
 				elseif dyneval( 'RESULT = class[''<<$class_list_institution[j]>>_<<$class_list_name[j]>>_grade'']') >  dyneval( 'RESULT = (2*<<university[''semester_week'']>> + 32)'):
 					'You''re following the <<$class_list_name[j]>> class well and will probably pass with a good grade if you keep this up, but to get the top mark you''ll need to put in some more effort.'
-
+					if dyneval ('RESULT = class[''<<$class_list_institution[j]>>_<<$class_list_name[j]>>_weekly_grade_gain''] +  class[''<<$class_list_institution[j]>>_<<$class_list_name[j]>>_optional_weekly_grade_gain'']') < dyneval('RESULT = class[''<<$class_list_institution[j]>>_<<$class_list_name[j]>>_weekly_grade_gain_breakeven_point'']'):
+						'So far you have not done enough work this week an if you don''t go to more classes and are active there or study more outside classes, you will not just fail to keep up, you will actually make your chances of getting good grade  worse.'
+					elseif dyneval ('RESULT = 3*(class[''<<$class_list_institution[j]>>_<<$class_list_name[j]>>_weekly_grade_gain''] +  class[''<<$class_list_institution[j]>>_<<$class_list_name[j]>>_optional_weekly_grade_gain''] -  class[''<<$class_list_institution[j]>>_<<$class_list_name[j]>>_weekly_grade_gain_breakeven_point''])') < dyneval('RESULT = 2*(class[''<<$class_list_institution[j]>>_<<$class_list_name[j]>>_weekly_grade_gain_max''] - class[''<<$class_list_institution[j]>>_<<$class_list_name[j]>>_weekly_grade_gain_breakeven_point''])'):
+						'The work you have put in this week so far is not enough to keep up, but at least you are not falling to much behind.'
+					elseif dyneval ('RESULT = 3*(class[''<<$class_list_institution[j]>>_<<$class_list_name[j]>>_weekly_grade_gain''] +  class[''<<$class_list_institution[j]>>_<<$class_list_name[j]>>_optional_weekly_grade_gain''] -  class[''<<$class_list_institution[j]>>_<<$class_list_name[j]>>_weekly_grade_gain_breakeven_point''])') >= dyneval('RESULT = 4*(class[''<<$class_list_institution[j]>>_<<$class_list_name[j]>>_weekly_grade_gain_max''] - class[''<<$class_list_institution[j]>>_<<$class_list_name[j]>>_weekly_grade_gain_breakeven_point''])'):
+						'You have so far put in more than enough work this week, and you situation is improving you keeping this up and you might end with good grade intead of a decent one.'
+					else
+						'You have so far put in the amount of work this week to keep up.'
+					end
 				elseif dyneval( 'RESULT = class[''<<$class_list_institution[j]>>_<<$class_list_name[j]>>_grade'']') >= dyneval( 'RESULT = (1*<<university[''semester_week'']>> + 32)'):
 					'You have trouble following the <<$class_list_name[j]>> class, but will probably still pass. If you want a good grade, then you''ll really need to do something about it.'
-
+					if dyneval ('RESULT = class[''<<$class_list_institution[j]>>_<<$class_list_name[j]>>_weekly_grade_gain''] +  class[''<<$class_list_institution[j]>>_<<$class_list_name[j]>>_optional_weekly_grade_gain'']') < dyneval('RESULT = class[''<<$class_list_institution[j]>>_<<$class_list_name[j]>>_weekly_grade_gain_breakeven_point'']'):
+						'So far you have not done enough work this week an if you don''t go to more classes and are active there or study more outside classes, you will not just fail to keep up, you will actually make your chances of getting good grade  worse.'
+					elseif dyneval ('RESULT = 3*(class[''<<$class_list_institution[j]>>_<<$class_list_name[j]>>_weekly_grade_gain''] +  class[''<<$class_list_institution[j]>>_<<$class_list_name[j]>>_optional_weekly_grade_gain''] -  class[''<<$class_list_institution[j]>>_<<$class_list_name[j]>>_weekly_grade_gain_breakeven_point''])') < dyneval('RESULT = (class[''<<$class_list_institution[j]>>_<<$class_list_name[j]>>_weekly_grade_gain_max''] - class[''<<$class_list_institution[j]>>_<<$class_list_name[j]>>_weekly_grade_gain_breakeven_point''])'):
+						'The work you have put in this week so far is not enough to keep up, but at least you are not falling to much behind.'
+					elseif dyneval ('RESULT = 3*(class[''<<$class_list_institution[j]>>_<<$class_list_name[j]>>_weekly_grade_gain''] +  class[''<<$class_list_institution[j]>>_<<$class_list_name[j]>>_optional_weekly_grade_gain''] -  class[''<<$class_list_institution[j]>>_<<$class_list_name[j]>>_weekly_grade_gain_breakeven_point''])') >= dyneval('RESULT = 3*(class[''<<$class_list_institution[j]>>_<<$class_list_name[j]>>_weekly_grade_gain_max''] - class[''<<$class_list_institution[j]>>_<<$class_list_name[j]>>_weekly_grade_gain_breakeven_point''])'):
+						'You have so far put in more than enough work this week, and you situation is improving you might soon not have trouble following the class anymore.'
+					else
+						'You have so far put in the amount of work this week to keep up.'
+					end
 				elseif dyneval( 'RESULT = class[''<<$class_list_institution[j]>>_<<$class_list_name[j]>>_grade'']') < 40:
 					'You will fail your <<$class_list_name[j]>> class unless you do something about it right now. It might even be too late to catch up.'
-
+					if dyneval ('RESULT = class[''<<$class_list_institution[j]>>_<<$class_list_name[j]>>_weekly_grade_gain''] +  class[''<<$class_list_institution[j]>>_<<$class_list_name[j]>>_optional_weekly_grade_gain'']') < dyneval('RESULT = class[''<<$class_list_institution[j]>>_<<$class_list_name[j]>>_weekly_grade_gain_breakeven_point'']'):
+						'So far you have not done enough work this week an if you don''t go to more classes and are active there or study more outside classes, you be even further from passing the class.'
+					elseif dyneval ('RESULT = 3*(class[''<<$class_list_institution[j]>>_<<$class_list_name[j]>>_weekly_grade_gain''] +  class[''<<$class_list_institution[j]>>_<<$class_list_name[j]>>_optional_weekly_grade_gain''] -  class[''<<$class_list_institution[j]>>_<<$class_list_name[j]>>_weekly_grade_gain_breakeven_point''])/(class[''<<$class_list_institution[j]>>_<<$class_list_name[j]>>_weekly_grade_gain_max''] - class[''<<$class_list_institution[j]>>_<<$class_list_name[j]>>_weekly_grade_gain_breakeven_point'']') >= dyneval('RESULT = 40 - class[''<<$class_list_institution[j]>>_<<$class_list_name[j]>>_grade'']'):
+						'You have put in enough work so far this week that you think you can pass the class if you keep this up for the rest of the semester.'
+					else
+						'The amount of work you have put in this week so far will improve your chance, but it is still not enough to guarantee that you pass the class.'
+					end
 				else
 					'You are hopelessly behind in your <<$class_list_name[j]>> class, but can probably still pass. Any hope of getting a good grade will require that you start doing something about it right now.'
+					if dyneval ('RESULT = class[''<<$class_list_institution[j]>>_<<$class_list_name[j]>>_weekly_grade_gain''] +  class[''<<$class_list_institution[j]>>_<<$class_list_name[j]>>_optional_weekly_grade_gain'']') < dyneval('RESULT = class[''<<$class_list_institution[j]>>_<<$class_list_name[j]>>_weekly_grade_gain_breakeven_point'']'):
+						'So far you have not done enough work this week an if you don''t go to more classes and are active there or study more outside classes, you will not just fail to keep up, you will actually make your chances of even passing the class  worse.'
+					elseif dyneval ('RESULT = 3*(class[''<<$class_list_institution[j]>>_<<$class_list_name[j]>>_weekly_grade_gain''] +  class[''<<$class_list_institution[j]>>_<<$class_list_name[j]>>_optional_weekly_grade_gain''] -  class[''<<$class_list_institution[j]>>_<<$class_list_name[j]>>_weekly_grade_gain_breakeven_point''])') < dyneval('RESULT = (class[''<<$class_list_institution[j]>>_<<$class_list_name[j]>>_weekly_grade_gain_max''] - class[''<<$class_list_institution[j]>>_<<$class_list_name[j]>>_weekly_grade_gain_breakeven_point''])'):
+						'The work you have put in this week so far is not enough to keep up, but at least you are not falling to much behind.'
+					elseif dyneval ('RESULT = 3*(class[''<<$class_list_institution[j]>>_<<$class_list_name[j]>>_weekly_grade_gain''] +  class[''<<$class_list_institution[j]>>_<<$class_list_name[j]>>_optional_weekly_grade_gain''] -  class[''<<$class_list_institution[j]>>_<<$class_list_name[j]>>_weekly_grade_gain_breakeven_point''])') >= dyneval('RESULT = 3*(class[''<<$class_list_institution[j]>>_<<$class_list_name[j]>>_weekly_grade_gain_max''] - class[''<<$class_list_institution[j]>>_<<$class_list_name[j]>>_weekly_grade_gain_breakeven_point''])'):
+						'The work you have put in so far is more than enough work this week, and you situation is improving.'
+					else
+						'You have so far put in the amount of work this week to keep up, but not really improve which is not good in your situation.'
+					end
+
 				end
 			end
 			j += 1