Fixing static content with dynamic content added video links

Author: mirlan

api/api.py

@@ -19,21 +19,42 @@ def get(self):
 		db.delete(c)
 
 
-
 class CourseAPI(webapp.RequestHandler):
     def post(self):
-		course=models.Course()
-		course.course_id=self.request.get('course_id')
-		course.course_type=self.request.get('course_type')
-		#course.effective_date=self.request.get('effective_date')
-		course.name=self.request.get('name')
-		course.description=self.request.get('description')
-		#course.status=self.request.get('status')
-		course.min_students=int(self.request.get('min_students'))
-		course.max_students=int(self.request.get('max_students'))
-		#course.duration=self.request.get('duration')
-		#course.education_units=self.request.get('education_units')
-		course.put()
+		if not self.request.get('course_id'):
+			return
+			
+		q = models.Course.gql("WHERE course_id = :1", self.request.get('course_id'))
+		if q.count() > 0:
+			c = q.fetch(1)[0]
+		else:
+			c = models.Course()
+			c.course_id = self.request.get('course_id')
+		
+		if self.request.get('course_type'):
+			c.course_type = self.request.get('course_type')
+		#if self.request.get('effective_date'):
+		#	c.effective_date = self.request.get('effective_date')
+		if self.request.get('name'):
+			c.name = self.request.get('name')
+		if self.request.get('description'):
+			c.description = self.request.get('description')
+		#if self.request.get('status'):
+		#	c.status = self.request.get('status')
+		if self.request.get('min_students'):
+			c.min_students=int(self.request.get('min_students'))
+		if self.request.get('max_students'):
+			c.max_students=int(self.request.get('max_students'))
+		#if self.request.get('duration'):
+		#	c.duration = self.request.get('duration')
+		#if self.request.get('education_units'):
+		#	c.education_units = self.request.get('education_units')
+		if self.request.get('mobile_video_url'):
+			c.mobile_video_url=db.Link(self.request.get('mobile_video_url'))
+		if self.request.get('mobile_video_url'):
+			c.web_video_url=db.Link(self.request.get('mobile_video_url'))
+		
+		c.put()
 
 class PrerequisiteAPI(webapp.RequestHandler):
     def post(self):
@@ -48,21 +69,46 @@ def post(self):
 
 class SessionAPI(webapp.RequestHandler):
     def post(self):
-		session=models.Session()
-		session.course=self.request.get('course')
-		session.session_number=self.request.get('session_number')
-		session.start_date=self.request.get('start_date')
-		session.end_date=self.request.get('end_date')
-		session.start_time=self.request.get('start_time')
-		session.end_time=self.request.get('end_time')
-		session.min_students=self.request.get('min_students')
-		session.max_students=self.request.get('max_students')
-		session.duration=self.request.get('duration')
-		session.address=self.request.get('address')
-		session.address2=self.request.get('address2')
-		session.city=self.request.get('city')
-		session.state=self.request.get('state')
-		session.put()
+		if not self.request.get('session_number'):
+			return # Error
+			
+		q = models.Session.gql("WHERE session_number = :1", self.request.get('session_number'))
+		if q.count() > 0:
+			s = q.fetch(1)[0]
+		else:
+			s = models.Session()
+			s.session_number = self.request.get('session_number')
+		
+		if self.request.get('course_id'):
+			q = models.Course.gql("WHERE course_id = :1", self.request.get('course_id'))
+			if q.count() > 0:
+				s.course = self.request.get(q.fetch(1)[0].key())
+			else:
+				return # Error
+		#if self.request.get('start_date'):
+		#	s.start_date = self.request.get('start_date')
+		#if self.request.get('end_date'):
+		#	s.end_date = self.request.get('end_date')
+		#if self.request.get('start_time'):
+		#	s.start_time = self.request.get('start_time')
+		#if self.request.get('end_time'):
+		#	s.end_time = self.request.get('end_time')
+		if self.request.get('min_students'):
+			s.min_students = int(self.request.get('min_students'))
+		if self.request.get('max_students'):
+			s.max_students = int(self.request.get('max_students'))
+		if self.request.get('duration'):
+			s.duration = self.request.get('duration')
+		if self.request.get('address'):
+			s.address = self.request.get('address')
+		if self.request.get('address2'):
+			s.address2 = self.request.get('address2')
+		if self.request.get('city'):
+			s.city = self.request.get('city')
+		if self.request.get('state'):
+			s.state = self.request.get('state')
+			
+		s.put()
 
 application = webapp.WSGIApplication(
 									[('/api/flush', FlushAPI),

app.yaml

@@ -1,5 +1,5 @@
 application: wda-mobile
-version: 1
+version: 2
 runtime: python
 api_version: 1
 
@@ -22,6 +22,10 @@ handlers:
 - url: /api/.*
   script: api/api.py
 
+- url: /admin/.*
+  script: /admin/admin.py
+  login: admin
+    
 - url: /search
   script: search.py
 

course.html

@@ -14,30 +14,25 @@
 
 <p>
 
-<h1>MS Word 101</h1>
-6 hours (1 six-hour day–0.6 CEUs)
+<h1>{{ course.name }}
+{% if admin_link %}
+ - <a href='{{ admin_link }}'>Edit</a>
+{% endif %}
+</h1>
+{{ course.duration }}
 <br/>
 <br/>
-<b>Description: </b> Public managers will receive an introduction to the skills and knowledge necessary to manage procurement, contracting and outsourcing activities. Managers will also be exposed to current and relevant case studies, from which they can draw principles to implement in their own organizations.
+<b>Description: </b> {{ course.description }}
 <br/>
 <br/>
-<b>Objectives: </b> Understand the responsibilities of line or program managers in the acquisition of goods and services, particularly in the day-to-day administration of procurement contracts and contractor relationships.
-Become familiar with the various types of contracts (e.g., fixed price, cost plus) and their relative strengths and weaknesses; be able to analyze a potential outsourcing situation or opportunity and understand how to develop a satisfactory statement of work.
-
-<br/>
-<br/>
-<b>Competencies: </b> Customer Service
-<br/>
-<b>Who Should Attend: </b> MSS and Non-MSS managers and supervisors only (CPM graduates are exempt)
-<br/>
-<b>Prerequisites: </b> None
 </p>
 <hr style="border:1px dashed;color:58595b" width="100%"/>
 <h2>Available Sessions</h2>
 
-<a href="/session?id=123">January 1st, 2011 - OJS</a> <br/>
-<a href="/session?id=123">January 31st, 2011 - OJS</a> <br/>
-<a href="/session?id=123">March 1st, 2011 - OJS</a> <br/>
+{% for session in sessions %}
+<a href="/session?session_number={{ session.session_number }}">{{ session.start_date }} {{ session.start_time }} {{ session.address }}</a> <br/>
+{% endfor %}
+
 
 <p>
 <a href="/">Home</a>

index.py

@@ -28,7 +28,7 @@ def get(self):
 			writer = ix.writer()
 			writer.add_document(title=course.name, content=course.description, path=course.course_id)
 			writer.commit()
-			self.response.out.write("indexed %s <br/>" % (course.name))
+			#self.response.out.write("indexed %s <br/>" % (course.name))
 
 application = webapp.WSGIApplication(
 									[('/api/index', IndexAPI)],

main.py

@@ -4,29 +4,53 @@
 import wsgiref.handlers
 from google.appengine.ext import webapp
 from google.appengine.ext.webapp import template
+from google.appengine.api import users
+import models
 
 class MainHandler(webapp.RequestHandler):
 	def get(self):
 
-		#query list of routes for dc-circulator
+		# get categories
+		# get subcategories
+		
 		template_values = {}
 		path = os.path.join(os.path.dirname(__file__), 'main.html')
 		self.response.out.write(template.render(path, template_values))		
 
 class CourseHandler(webapp.RequestHandler):
 	def get(self):
-
-		template_values = {'name': "course_name",
-							'id':'course_id'}
+		q = models.Course.gql("WHERE course_id = :1", self.request.get('course_id'))
+		course = q.fetch(1)[0]
+		
+		q = models.Session.gql("WHERE course_id = :1", course.key())
+		sessions = []
+		for session in q:
+			sessions.append(session)
+			
+		admin_link = None
+		if users.is_current_user_admin():
+			admin_link = '/admin/course?course_id=%s' % self.request.get('course_id')
+		
+		template_values = { 'course': course,
+		 					'sessions': sessions,
+							'admin_link': admin_link,
+							}
 		path = os.path.join(os.path.dirname(__file__), 'course.html')
-		self.response.out.write(template.render(path, template_values))		
+		self.response.out.write(template.render(path, template_values))
 
 
 class SessionHandler(webapp.RequestHandler):
 	def get(self):
-
-		template_values = {'name': "course_name",
-							'id':'course_id'}
+		q = models.Session.gql("WHERE session_number = :1", self.request.get('session_number'))
+		session = q.fetch(1)[0]
+		
+		admin_link = None
+		if users.is_current_user_admin():
+			admin_link = '/admin/session?session_number=%s' % self.request.get('session_number')
+			
+		template_values = { 'session': session,
+							'admin_link': admin_link,
+		}
 		path = os.path.join(os.path.dirname(__file__), 'session.html')
 		self.response.out.write(template.render(path, template_values))		
 

models.py

@@ -13,6 +13,8 @@ class Course(db.Model):
 	max_students=db.IntegerProperty()
 	duration=db.IntegerProperty()
 	education_units=db.IntegerProperty()
+	mobile_video_url=db.LinkProperty()
+	web_video_url=db.LinkProperty()
 
 class Prerequisite(db.Model):
 	#prerequisites

search.html

@@ -22,7 +22,7 @@
 <p>
 {% for r in results %}
 		<b>
-			<a href="/course?id={{r.id}}">{{ r.name }}</a>
+			<a href="/course?course_id={{r.id}}">{{ r.name }}</a>
 		</b>
 		<br/>
 {% endfor %}

session.html

@@ -17,20 +17,20 @@
 
 <input type="submit" value="Register now!"></input>
 
-<h1>MS Word 101</h1>
-6 hours (1 six-hour day–0.6 CEUs)
+<h1>{{ session.course.name }}</h1>
+{{ session.course.duration }}
 <br/>
 <br/>
-<b>Date: </b> January 1st, 2010
+<b>Date: </b> {{ session.start_date }}
 <br/>
-<b>Time: </b> 9am-5pm
+<b>Time: </b> {{ session.start_time }}
 <br/>
 
-<b>Capacity: </b> 8-20 people
+<b>Capacity: </b> {{ session.min_people }}-{{ session.max_people }}
 <br/>
 
 <br/>
-<b>Location: </b> 441 4th Str., NW, Suite 850S, <br/>Washington, DC 20001<br/>
+<b>Location: </b> {{ session.address }}, <br/>{{ session.city }}, {{ session.state }} {{ session.zip }}<br/>
 
 <iframe width="300" height="300" frameborder="0" scrolling="no" marginheight="0" marginwidth="0" src="http://maps.google.com/maps?f=q&amp;source=s_q&amp;hl=en&amp;geocode=&amp;q=441+4th+St+NW,+Washington,+DC+20001&amp;sll=37.0625,-95.677068&amp;sspn=62.057085,128.583984&amp;ie=UTF8&amp;hq=&amp;hnear=441+4th+St+NW,+Washington+D.C.,+District+of+Columbia,+20001&amp;ll=38.895442,-77.015877&amp;spn=0.02004,0.025749&amp;z=14&amp;output=embed"></iframe><br /><small><a href="http://maps.google.com/maps?f=q&amp;source=embed&amp;hl=en&amp;geocode=&amp;q=441+4th+St+NW,+Washington,+DC+20001&amp;sll=37.0625,-95.677068&amp;sspn=62.057085,128.583984&amp;ie=UTF8&amp;hq=&amp;hnear=441+4th+St+NW,+Washington+D.C.,+District+of+Columbia,+20001&amp;ll=38.895442,-77.015877&amp;spn=0.02004,0.025749&amp;z=14" style="color:#0000FF;text-align:left">View Larger Map</a></small>