diff --git a/aprendizations/learnapp.py b/aprendizations/learnapp.py index 12f6717..dbadf3f 100644 --- a/aprendizations/learnapp.py +++ b/aprendizations/learnapp.py @@ -52,7 +52,6 @@ class LearnApp(): 'number': ..., 'name': ..., 'state': StudentState(), - # 'counter': ... }, ... } ''' @@ -174,10 +173,8 @@ class LearnApp(): if pw_ok: if uid in self.online: logger.warning('User "%s" already logged in', uid) - counter = self.online[uid]['counter'] # FIXME else: logger.info('User "%s" logged in', uid) - counter = 0 # get topics for this student and set its current state query = select(StudentTopic).where(StudentTopic.student_id == uid) @@ -195,7 +192,6 @@ class LearnApp(): 'state': StudentState(uid=uid, state=state, courses=self.courses, deps=self.deps, factory=self.factory), - 'counter': counter + 1, # count simultaneous logins FIXME } else: @@ -494,10 +490,6 @@ class LearnApp(): return factory - # def get_login_counter(self, uid: str) -> int: - # '''login counter''' - # return int(self.online[uid]['counter']) - def get_student_name(self, uid: str) -> str: '''Get the username''' return self.online[uid].get('name', '') diff --git a/aprendizations/serve.py b/aprendizations/serve.py index 14ddb05..668519a 100644 --- a/aprendizations/serve.py +++ b/aprendizations/serve.py @@ -18,7 +18,7 @@ import uuid import tornado.httpserver import tornado.ioloop import tornado.web -from tornado.escape import to_unicode, utf8 +from tornado.escape import to_unicode # this project from aprendizations.renderer_markdown import md_to_html @@ -122,7 +122,6 @@ class CoursesHandler(BaseHandler): '''Render available courses''' uid = self.current_user self.render('courses.html', - appname=APP_NAME, uid=uid, name=self.app.get_student_name(uid), courses=self.app.get_courses(), @@ -150,7 +149,6 @@ class CourseHandler2(BaseHandler): self.redirect('/courses') self.render('maintopics-table2.html', - appname=APP_NAME, uid=uid, name=self.app.get_student_name(uid), state=self.app.get_student_state(uid), @@ -213,7 +211,6 @@ class TopicHandler(BaseHandler): self.redirect('/topics') self.render('topic.html', - appname=APP_NAME, uid=uid, name=self.app.get_student_name(uid), course_id=self.app.get_current_course_id(uid), @@ -407,7 +404,6 @@ class RankingsHandler(BaseHandler): course_id = self.get_query_argument('course', default=current_course) rankings = self.app.get_rankings(uid, course_id) self.render('rankings.html', - appname=APP_NAME, uid=uid, name=self.app.get_student_name(uid), rankings=rankings, diff --git a/aprendizations/templates/courses.html b/aprendizations/templates/courses.html index 35d3602..781b58a 100644 --- a/aprendizations/templates/courses.html +++ b/aprendizations/templates/courses.html @@ -15,7 +15,7 @@ - {{appname}} + aprendizations diff --git a/aprendizations/templates/login.html b/aprendizations/templates/login.html index dec8abd..b2df18c 100644 --- a/aprendizations/templates/login.html +++ b/aprendizations/templates/login.html @@ -3,7 +3,8 @@ - + + {% include include-libs.html %} diff --git a/aprendizations/templates/maintopics-table.html b/aprendizations/templates/maintopics-table.html index 7e4ea96..ccaf4a4 100644 --- a/aprendizations/templates/maintopics-table.html +++ b/aprendizations/templates/maintopics-table.html @@ -5,8 +5,8 @@ - - + + {% include include-libs.html %} diff --git a/aprendizations/templates/rankings.html b/aprendizations/templates/rankings.html index 7077330..e92e131 100644 --- a/aprendizations/templates/rankings.html +++ b/aprendizations/templates/rankings.html @@ -5,15 +5,15 @@ - - + + {% include include-libs.html %} - {{appname}} + aprendizations diff --git a/aprendizations/templates/topic.html b/aprendizations/templates/topic.html index c6e14bb..d4340f1 100644 --- a/aprendizations/templates/topic.html +++ b/aprendizations/templates/topic.html @@ -4,7 +4,7 @@ - + {% include include-libs.html %} @@ -13,7 +13,7 @@ - {{appname}} + aprendizations -- libgit2 0.21.2