Release v1.0.0

docs/RELEASE_NOTES.md

@@ -0,0 +1,5 @@
+# Release Notes : Cronus
+
+## v1.0.0
+    * Resurrected code to working state
+    * Switched to sqlitedb as of now (will test mongodb later)

docs/database/mongoDb.txt

@@ -11,7 +11,7 @@ db.resume.insertMany([
    		iNum : "24654363",
    		name : "Employee 1",
    		entity : "Company Labs",
-   		oraganization : "IBSO",
+   		oraganization : "org 1",
    		current_project : "Project 1",
    		isStaffed : false,
    		booked_till : "",
@@ -46,7 +46,7 @@ db.resume.insertMany([
    		iNum : "1345425353",
    		name : "Sanjay Leela Bhansali",
    		entity : "Company Labs",
-   		oraganization : "IBSO",
+   		oraganization : "org 1",
    		current_project : "DU",
    		isStaffed : true,
    		booked_till : "2018-09-10",
@@ -77,7 +77,7 @@ db.resume.insertMany([
    		iNum : "1536471",
    		name : "Bhoot Naath",
    		entity : "Company Labs",
-   		oraganization : "IBSO",
+   		oraganization : "org 1",
    		current_project : "RIO",
    		isStaffed : true,
    		booked_till : "2018-09-21",
@@ -108,7 +108,7 @@ db.resume.insertMany([
    		iNum : "GE253744",
    		name : "Elon Musk",
    		entity : "Company Labs",
-   		oraganization : "IBSO",
+   		oraganization : "org 1",
    		current_project : "",
    		isStaffed : false,
          booked_till : "",
@@ -171,7 +171,7 @@ db.project.insertMany([
    		projectName : "Project 1",
          zone : "APJ",
    		entity : "Company Labs",
-   		oraganization : "IBSO",
+   		oraganization : "org 1",
          duration : {
             "start" : "2018-03-21",
             "end" : "2018-11-23"

requirements.txt

@@ -1,7 +1,6 @@
 Django==2.1.15
 djongo==1.2.29
 pip==18.0
-pkg-resources==0.0.0
 pymongo==3.7.1
 setuptools==40.2.0
 wheel==0.31.1

website/backend_cronus/backend_cronus/conf/dev_server/settings.py

@@ -28,6 +28,7 @@
 
 ALLOWED_HOSTS = [
     'cronus.com',
+    '127.0.0.1'
 ]
 
 
@@ -40,6 +41,7 @@
     'django.contrib.sessions',
     'django.contrib.messages',
     'django.contrib.staticfiles',
+    'backend_cronus',
     'employee',
     'management',
     'projects',
@@ -86,14 +88,14 @@
 # https://docs.djangoproject.com/en/2.1/ref/settings/#databases
 
 DATABASES = {
+    # 'default': {
+    #     'ENGINE' : 'djongo',
+    #     'NAME' : 'cronus001',
+    # },
     'default': {
-        'ENGINE' : 'djongo',
-        'NAME' : 'cronus004',
+        'ENGINE': 'django.db.backends.sqlite3',
+        'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),
     },
-    # 'default': {
-    #     'ENGINE': 'django.db.backends.sqlite3',
-    #     'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),
-    # }
 }
 
 # Password validation
@@ -193,4 +195,31 @@
     os.path.join(BASE_DIR, 'static/assets/'),
 ]
 
-SESSION_COOKIE_DOMAIN = "cronus.com"
+SESSION_COOKIE_DOMAIN = "cronus.com"
+
+SETTINGS_PATH = os.path.dirname(__file__)
+PROJECT_PATH = os.path.join(SETTINGS_PATH, os.pardir)
+PROJECT_PATH = os.path.abspath(PROJECT_PATH)
+TEMPLATES_PATH = os.path.join(PROJECT_PATH, "templates")
+
+TEMPLATE_DIR = (
+    TEMPLATES_PATH,
+)
+
+TEMPLATES = [
+    {
+        'BACKEND': 'django.template.backends.django.DjangoTemplates',
+        'DIRS': [],
+        'APP_DIRS': True,
+        'OPTIONS': {
+            'context_processors': [
+                'django.template.context_processors.debug',
+                'django.template.context_processors.request',
+                'django.contrib.auth.context_processors.auth',
+                'django.contrib.messages.context_processors.messages',
+            ],
+        },
+    },
+]
+
+DIRS = [TEMPLATE_DIR,]

website/backend_cronus/backend_cronus/static

@@ -0,0 +1 @@
+../../frontend_cronus/static

website/backend_cronus/backend_cronus/templates

@@ -0,0 +1 @@
+../../frontend_cronus/templates

website/backend_cronus/backend_cronus/urls.py

@@ -31,7 +31,8 @@
     url(r'^management/', include('management.urls', namespace='management')),
     # url(r'^$', TemplateView.as_view(template_name="index.html")),
     url(r'^index$|^home$|^$', TemplateView.as_view(template_name="index.html")),
+    # url(r'^test$', "Hello"),
     url(r'^.*$', TemplateView.as_view(template_name="pageNotFound.html")),
-] 
+]
 
-urlpatterns += static(settings.STATIC_URL, document_root=settings.STATIC_ROOT)
+urlpatterns += static(settings.STATIC_URL, document_root=settings.STATIC_ROOT)

website/backend_cronus/employee/employee

@@ -0,0 +1 @@
+../../frontend_cronus/templates/employee

website/backend_cronus/management/management

@@ -0,0 +1 @@
+../../frontend_cronus/templates/management

website/backend_cronus/static

@@ -0,0 +1 @@
+../frontend_cronus/static

website/backend_cronus/templates

@@ -0,0 +1 @@
+../frontend_cronus/templates

website/frontend_cronus/templates/employee/login.html

@@ -4,35 +4,35 @@
 	<h1>
 	    Welcome to Employee Login Page
 	</h1>
-	
+
     <div id="content-container" class="container p-none" style="align-content='middle'">
         <div class="lgn-container col-lg-8">
-            <form id="login-form" method="POST" 
+            <form id="login-form" method="POST"
                   action="">
                 {% csrf_token %}
                 <table class="table">
                     <tr>
                         <td><label for="iNum">I-Number</label></td>
                         <td>
                             <!-- <input type="text" name="I" readonly value="I""> -->
-                            <input id="iNum" name="iNum" 
-                                   type="text" placeholder="I341551" class="form-control" autocomplete="off">
+                            <input id="iNum" name="iNum"
+                                   type="text" placeholder="Employee ID" class="form-control" autocomplete="off">
                                </td>
                     </tr>
                     <tr>
                         <td><label for="password">Password</label></td>
-                        <td><input id="password" name="password" 
+                        <td><input id="password" name="password"
                                    type="password" class="form-control"></td>
                     </tr>
                 </table>
                 {% if form.errors %}
                     <div class=" label label-danger" style="background-color: orange; ">
-                        Failed to Login! </br> 
+                        Failed to Login! </br>
                         {{ form.errors }}
                     </div>
                 {% endif %}
 
-                <input type="submit" value="Login" 
+                <input type="submit" value="Login"
                        class="btn btn-primary pull-right" />
                 <input type="hidden" name="next" value="{{ next }}" />
 

website/frontend_cronus/templates/employee/register.html

@@ -8,34 +8,34 @@ <h1>
         <div class="lgn-container col-lg-8">
             <form id="register-form" method="POST" action="">
                 {% csrf_token %}
- 
+
                 <table class="table">
                     <tr>
                         <td><label for="username">I-Number</label></td>
                         <td>
                             <!-- <input type="text" name="I" readonly value="I""> -->
-                            <input id="username" name="username" 
-                                   type="text" placeholder="I341551" class="form-control" autocomplete="off">
+                            <input id="username" name="username"
+                                   type="text" placeholder="Employee ID" class="form-control" autocomplete="off">
                                </td>
                     </tr>
                     <tr>
                         <td><label for="first_name">Full Name</label></td>
-                        <td><input id="first_name" name="first_name" 
+                        <td><input id="first_name" name="first_name"
                                    type="text" placeholder="What's in a name?" class="form-control"></td>
                     </tr>
                     <tr>
                         <td><label for="is_active">Request Management access</label></td>
-                        <td><input id="is_active" name="is_active" 
+                        <td><input id="is_active" name="is_active"
                                    type="checkbox" class="form-control"></td>
                     </tr>
                     <tr>
                         <td><label for="password">Create password</label></td>
-                        <td><input id="password" name="password" 
+                        <td><input id="password" name="password"
                                    type="password" placeholder="Must be unique and strong" class="form-control"></td>
                     </tr>
                     <tr>
                         <td><label for="password2">Repeat password</label></td>
-                        <td><input id="password2" name="password2" 
+                        <td><input id="password2" name="password2"
                                    type="password" placeholder="Confirm password again" class="form-control"></td>
                     </tr>
                 </table>
@@ -46,7 +46,7 @@ <h1>
                     </div>
                 {% endif %}
 
-                <input type="submit" value="Register" 
+                <input type="submit" value="Register"
                        class="btn btn-primary pull-right" />
                 <input type="hidden" name="next" value="{{ next }}" />
 
@@ -100,7 +100,7 @@ <h1>
                 <option value="L4">
                 <option value="L5">
             </datalist>
-            
+
         </div>
     </div>
     <div class="employee-registration-note" style="position: absolute;bottom: 10px; border: 20px;padding: 20px;background: gray;width: 300px;">

website/frontend_cronus/templates/employee/register.html.old

@@ -8,51 +8,51 @@
         <div class="lgn-container col-lg-8">
             <form id="register-form" method="POST" action="">
                 {% csrf_token %}
- 
+
                 <table class="table">
                     <tr>
                         <td><label for="iNum">I-Number</label></td>
                         <td>
                             <!-- <input type="text" name="I" readonly value="I""> -->
-                            <input id="iNum" name="iNum" 
-                                   type="text" placeholder="I341551" class="form-control" autocomplete="off">
+                            <input id="iNum" name="iNum"
+                                   type="text" placeholder="Employee ID" class="form-control" autocomplete="off">
                                </td>
                     </tr>
                     <tr>
                         <td><label for="name">Full Name</label></td>
-                        <td><input id="name" name="name" 
+                        <td><input id="name" name="name"
                                    type="text" placeholder="What's in a name?" class="form-control"></td>
                     </tr>
                     <tr>
                         <td><label for="designation">Designation</label></td>
-                        <td><input list="designation" name="designation" 
+                        <td><input list="designation" name="designation"
                                    placeholder="Senior Developer" class="form-control" autocomplete="off"></td>
                     </tr>
                     <tr>
                         <td><label for="tier">Tier</label></td>
-                        <td><input list="tier" name="tier" 
+                        <td><input list="tier" name="tier"
                                     placeholder="T3" class="form-control" autocomplete="off"></td>
-                        <td><input list="grade" name="grade" 
+                        <td><input list="grade" name="grade"
                                     placeholder="L2" class="form-control" autocomplete="off"></td>
                     </tr>
                     <tr>
                         <td><label for="experience">Experience</label></td>
-                        <td><input id="experience" name="experience" 
+                        <td><input id="experience" name="experience"
                                    type="number" placeholder="7" class="form-control" autocomplete="off"></td>
                     </tr>
                     <tr>
                         <td><label for="isManagement">Request Management access</label></td>
-                        <td><input id="isManagement" name="isManagement" 
+                        <td><input id="isManagement" name="isManagement"
                                    type="checkbox" class="form-control"></td>
                     </tr>
                     <tr>
                         <td><label for="password">Create password</label></td>
-                        <td><input id="password" name="password" 
+                        <td><input id="password" name="password"
                                    type="password" placeholder="Must be unique and strong" class="form-control"></td>
                     </tr>
                     <tr>
                         <td><label for="password2">Repeat password</label></td>
-                        <td><input id="password2" name="password2" 
+                        <td><input id="password2" name="password2"
                                    type="password" class="form-control"></td>
                     </tr>
                 </table>
@@ -63,7 +63,7 @@
                     </div>
                 {% endif %}
 
-                <input type="submit" value="Register" 
+                <input type="submit" value="Register"
                        class="btn btn-primary pull-right" />
                 <input type="hidden" name="next" value="{{ next }}" />
 
@@ -117,7 +117,7 @@
                 <option value="L4">
                 <option value="L5">
             </datalist>
-            
+
         </div>
     </div>
     <div class="employee-registration-note" style="position: absolute;bottom: 10px; border: 20px;padding: 20px;background: gray;width: 300px;">
@@ -133,17 +133,17 @@
 <!-- Add previous projects after login, as an option to update under accound settings -->
 <!-- <tr>
     <td><label for="previousProjects">Previous Projects</label></td>
-    <td><input id="previousProjects" name="previousProjects" 
+    <td><input id="previousProjects" name="previousProjects"
                type="text" class="form-control"></td>
 </tr> -->
 <!-- <tr>
     <td><label for="entity">Entity</label></td>
-    <td><input id="entity" name="entity" 
+    <td><input id="entity" name="entity"
                type="text" class="form-control"></td>
 </tr>
 <tr>
     <td><label for="organization">Organization</label></td>
-    <td><input id="organization" name="organization" 
+    <td><input id="organization" name="organization"
                type="text" class="form-control"></td>
 </tr> -->
 <!-- <tr>