Adding public rules page; rounding points

app.js

@@ -30,7 +30,8 @@ dotenv.load({ path: '.env' });
 const homeController = require('./controllers/home');
 const userController = require('./controllers/user');
 const logEntryController = require('./controllers/logEntry');
-const contestController = require('./controllers/contest')
+const contestController = require('./controllers/contest');
+const rulesController = require('./controllers/rules');
 
 /**
  * API keys and Passport configuration.
@@ -118,6 +119,7 @@ app.use(express.static(path.join(__dirname, 'public'), { maxAge: 31557600000 }))
  * Primary app routes.
  */
 app.get('/', homeController.index);
+app.get('/rules', rulesController.index);
 app.get('/login', userController.getLogin);
 app.post('/login', userController.postLogin);
 app.get('/logout', userController.logout);

controllers/home.js

@@ -11,13 +11,10 @@ exports.index = (req, res) => {
  const tomorrow = moment(today).add(1, 'days').format(dateMask);
  const entriesTodayQuery = {"date": { "$gte": today, "$lt": tomorrow } };
 
- console.log(entriesTodayQuery);
-
  LogEntry.find(entriesTodayQuery, function(err, result) {
    if (err) {
      res.status(500).send({"error": err})
    } else {
-     console.log(result);
      res.render('home', {
        title: 'Home',
        user: req.user,

controllers/logEntry.js

@@ -18,16 +18,16 @@ exports.getActivityDefinitions = (req, res) => {
  */
 calculateActivityPoints = (logEntry) => {
   const activityDefinition = lookups.activitiesSortedAlpha[logEntry.activity];
-  // console.log(JSON.stringify(logEntry));
+  console.log(JSON.stringify(logEntry));
 
   // Is it the right time unit?
   if (logEntry.durationUnit !== activityDefinition.durationUnit) {
     throw Error('500 error: Invalid activity.durationUnit: ' + logEntry.durationUnit + '. Expected: ' + activityDefinition.durationUnit);
   }
 
-  const completedTimeChunks = Math.floor(logEntry.durationValue / activityDefinition.durationValue);
-  const points = completedTimeChunks * activityDefinition.points;
-  // console.log("calculated points: " + points);
+  const completedTimeChunks = logEntry.durationValue / activityDefinition.durationValue;
+  const points = Math.round(completedTimeChunks * activityDefinition.points);
+  console.log("calculated points: " + points);
 
   return points;
 };

controllers/rules.js

@@ -0,0 +1,11 @@
+
+/**
+ * GET /
+ * Rules page.
+ */
+exports.index = (req, res) => {
+ res.render('rules', {
+   title: 'Rules',
+   user: req.user 
+ });
+};

public/css/main.scss

@@ -137,6 +137,14 @@ textarea {
   margin-left: 1em;
 }
 
+.paper {
+  margin: 20px;
+  width: 100%;
+  box-shadow: 0px 0px 30px 3px grey;
+}
+
+
+
 // .entry-duration-value-input {
 //   max-width: 100px;
 // }

public/js/log.js

@@ -46,7 +46,7 @@ fillLogEntries = () => {
   const startDate = dayElems[0].dataset.date;
   const endDate = dayElems[dayElems.length - 1].dataset.date;
   const getLogEntriesUrl = '/api/log?' + jQuery.param({
-    "userEmail": ownerEmail,
+    "user": ownerEmail,
     "from": startDate,
     "to": endDate
   });
@@ -115,7 +115,7 @@ drawLogEntryModal = (clickedDayElem) => {
    let entryData = {
      "date": entryDateField.text(),
      "title": entryTitleField.val(),
-     "userEmail": ownerEmail,
+     "user": ownerEmail,
      "activity": entryActivityField.html(),
      "description": entryDescriptionField.val(),
      "durationValue": entryDurationValueField.val(),
@@ -335,8 +335,8 @@ selectActivity = (activityElem) => {
 $(document).ready(function() {
   setCSRFToken($('meta[name="csrf-token"]').attr('content'));
 
-  console.log('ownerEmail: ' + ownerEmail);
-  console.log('userEmail: ' + userEmail);
+  // console.log('ownerEmail: ' + ownerEmail);
+  // console.log('userEmail: ' + userEmail);
 
   modal.modal('hide');
 

views/partials/header.pug

@@ -13,6 +13,8 @@
       ul.nav.navbar-nav
         li(class=(title == 'Home') ? 'active' : undefined)
           a(href='/') Home
+        li(class=(title == 'Rules') ? 'active' : undefined)
+          a(href='/rules') Rules
         if user
           li(class=(title == 'My Log') ? 'active' : undefined)
             a(href='/log/' + user.email) My Log

views/rules/index.pug

@@ -0,0 +1,8 @@
+extends ../layout
+
+block content
+  h1 Rules
+
+  .row
+    .col-md-10.col-md-offset-1
+      img.paper(src='/rules.jpg' title="Rules")