feat: added new tables holiday and leave

server/migrations/20190116075822-create-work-day.js

@@ -23,11 +23,9 @@ module.exports = {
         type: Sequelize.STRING
       },
       from: {
-        allowNull: false,
         type: Sequelize.TIME
       },
       to: {
-        allowNull: false,
         type: Sequelize.TIME
       },
       logged_hours: {
@@ -46,4 +44,4 @@ module.exports = {
   down: (queryInterface, Sequelize) => {
     return queryInterface.dropTable('WorkDays');
   }
-};
+};

server/migrations/20190116081053-create-holiday.js

@@ -16,11 +16,9 @@ module.exports = {
         type: Sequelize.STRING
       },
       from: {
-        allowNull: false,
         type: Sequelize.TIME
       },
       to: {
-        allowNull: false,
         type: Sequelize.TIME
       },
       createdAt: {
@@ -36,4 +34,4 @@ module.exports = {
   down: (queryInterface, Sequelize) => {
     return queryInterface.dropTable('Holidays');
   }
-};
+};

server/models/holiday.js

@@ -1,30 +1,22 @@
 export default (sequelize, DataTypes) => {
-    const Holiday = sequelize.define('Holiday', {
-        date: {
-            type: DataTypes.DATE,
-            allowNull: {
-                args: false,
-                msg: 'Please enter a date'
-            }
-        },
-        notes: DataTypes.STRING,
-        from: {
-            type: DataTypes.TIME,
-            allowNull: {
-                args: false,
-                msg: 'Please enter start time'
-            }
-        },
-        to: {
-            type: DataTypes.TIME,
-            allowNull: {
-                args: false,
-                msg: 'Please enter end time'
-            }
-        },
-    }, {});
-    Holiday.associate = function (models) {
-        // associations can be defined here
-    };
-    return Holiday;
-};
+  const Holiday = sequelize.define(
+    'Holiday',
+    {
+      date: {
+        type: DataTypes.DATE,
+        allowNull: {
+          args: false,
+          msg: 'Please enter a date'
+        }
+      },
+      notes: DataTypes.STRING,
+      from: DataTypes.TIME,
+      to: DataTypes.TIME
+    },
+    {}
+  );
+  Holiday.associate = function(models) {
+    // associations can be defined here
+  };
+  return Holiday;
+};

server/models/workday.js

@@ -1,39 +1,31 @@
 export default (sequelize, DataTypes) => {
-    const WorkDay = sequelize.define('WorkDay', {
-        user_id: {
-            type: DataTypes.INTEGER,
-            allowNull: {
-                args: false,
-                msg: 'Please enter user\'s name'
-            }
-        },
-        date: {
-            type: DataTypes.DATE,
-            allowNull: {
-                args: false,
-                msg: 'Please enter a date'
-            }
-        },
-        tags: DataTypes.STRING,
-        notes: DataTypes.STRING,
-        from: {
-            type: DataTypes.TIME,
-            allowNull: {
-                args: false,
-                msg: 'Please enter start time'
-            }
-        },
-        to: {
-            type: DataTypes.TIME,
-            allowNull: {
-                args: false,
-                msg: 'Please enter end time'
-            }
-        },
-        logged_hours: {type: DataTypes.DOUBLE}
-    }, {});
-    WorkDay.associate = function (models) {
-        // associations can be defined here
-    };
-    return WorkDay;
-};
+  const WorkDay = sequelize.define(
+    'WorkDay',
+    {
+      user_id: {
+        type: DataTypes.INTEGER,
+        allowNull: {
+          args: false,
+          msg: "Please enter user's name"
+        }
+      },
+      date: {
+        type: DataTypes.DATE,
+        allowNull: {
+          args: false,
+          msg: 'Please enter a date'
+        }
+      },
+      tags: DataTypes.STRING,
+      notes: DataTypes.STRING,
+      from: DataTypes.TIME,
+      to: DataTypes.TIME,
+      logged_hours: {type: DataTypes.DOUBLE}
+    },
+    {}
+  );
+  WorkDay.associate = function(models) {
+    // associations can be defined here
+  };
+  return WorkDay;
+};