Merge pull request #92 from kmAyush/forPr1

Interview Experience Update

Author: ash1969

website/events/forms.py

@@ -4,11 +4,13 @@
 from .validators import valid_url_extension
 from .validators import valid_url_mimetype
 from django.utils.translation import ugettext as _
+from markdownx.fields import MarkdownxFormField
 import mimetypes
 
 class Eventsform(forms.ModelForm):
     title = models.CharField(max_length=30)
     description = models.TextField()
+    description = MarkdownxFormField()
     image_url = models.URLField()
     start_time = models.DateTimeField()
     end_time = models.DateTimeField() 

website/events/models.py

@@ -1,11 +1,13 @@
 from django.db import models
 from django.contrib.auth.models import User
 from django.contrib.auth import get_user_model
+from markdownx.models import MarkdownxField
+from markdownx.utils import markdownify
 
 # DONE
 class Events(models.Model):
     title = models.CharField(max_length=30)
-    description = models.TextField()
+    description = MarkdownxField()
     image_url = models.URLField(blank=True, null=True)
     image = models.ImageField(blank=True, null=True, upload_to='images/')
     start_time = models.DateTimeField()
@@ -14,6 +16,12 @@ class Events(models.Model):
     # AUTOGEN DATE TIME
     created_at = models.DateTimeField(auto_now=False, auto_now_add=True)
     updated_at = models.DateTimeField(auto_now=True, auto_now_add=False)
+
+    # Create a property that returns the markdown instead
+    @property
+    def formatted_markdown(self):
+        return markdownify(self.description)
+
     def __str__(self):
         return self.title
     class Meta:

website/events/templates/create_event.html

@@ -24,6 +24,7 @@ <h1>Hello superuser:Add New Event</h1>
                       {{ form }}
 
                   </table>
+                      {{ form.media }}
                       <br>
                   <input type="submit" value="Submit">
                 </form>

website/forum/templates/base.html

@@ -79,6 +79,9 @@
             <li class="nav-item {% block AskREC_active %}{% endblock %}">
                 <a href="{% url 'forum:list_questions' %}" class="nav-link m-2 menu-item">AskREC</a>
             </li>
+            <li class="nav-item {% block interview_active %}{% endblock %}">
+              <a href="{% url 'experience:list_experiences' %}" class="nav-link m-2 menu-item">Interview Experiences</a>
+            </li>
             <li class="nav-item {% block Events_active %}{% endblock %}">
                 <a href="{% url 'events:calender' %}" class="nav-link m-2 menu-item">Events</a>
             </li>

website/forum/templates/home.html

@@ -60,6 +60,7 @@
 {% endblock%}  
 
 {% block content %}
+{% load widget_tweaks %}
   <!-- <h2>Homepage</h2> -->
   <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
   <script type="text/javascript" src="https://rawgit.com/notifyjs/notifyjs/master/dist/notify.js"></script>
@@ -100,9 +101,9 @@
       <a class="small text-center"href="{% url 'events:calender' %}">Check out upcoming events!</a>
       <hr class="mt-0">
       {% for event in events %}
-      <h5 class="text-muted text-center" style="text-transform:uppercase;">{{event.title}}</h5>
-      <span style="font-size:90%;">{{event.description}}</span><br>
-      <p class="small mb-0" style="color:#666666; float:right;">on {{event.start_time}}</p>
+      <h5 class="text-muted text-center" style="text-transform:uppercase;">{{ event.title }}</h5>
+      <span style="font-size:90%;">{{ event.formatted_markdown | safe }}</span><br>
+      <p class="small mb-0" style="color:#666666; float:right;">on {{ event.start_time }}</p>
       {%endfor%}
   </div>
   <div class="row">

website/forum/templates/team.html

@@ -62,7 +62,6 @@ <h3 class="team-title">Shubham Gupta</h3>
     <!-- TEAM MEMBER -->
     <div class="container mt-5">
       <div class="row">
-        <div class="col-sm-4 col-md-2 col-lg-3"></div>
         <div class="col-sm-4 col-md-2 col-lg-3">
             <center>
               <img class="head mt-3 mb-2 rounded-circle" src="../media/images/team/3 Ritesh.jpg" style="border: solid 5px #343A3F; border-radius: 100%;"height="120px" width="120px"><br>
@@ -79,7 +78,6 @@ <h3 class="team-title">Shubham Gupta</h3>
             </center>
         </div>
 
-        <div class="col-sm-4 col-md-2 col-lg-3"></div>
 
         <div class="col-sm-4 col-md-2 col-lg-3">
           <center>
@@ -101,7 +99,7 @@ <h3 class="team-title">Shubham Gupta</h3>
           <center>
             <img class="head mt-3 mb-2 rounded-circle" src="../media/images/team/3 Jaysurya.jpg" style="border: solid 5px #343A3F; border-radius: 100%;"height="120px" width="120px"><br>
             <strong>Jeya Surya</strong><br>
-            <small class="text-muted">WebD Head</small>
+            <small class="text-muted">Web and Tech Head</small>
           </center>
         </div>
 
@@ -164,23 +162,23 @@ <h3 class="team-title">Shubham Gupta</h3>
         <div class="col-sm-4 col-md-2 col-lg-3">
           <center>
             <img class="head mt-3 mb-2 rounded-circle" src="../media/images/team/2 Abhishekh.jpg" style="border: solid 5px #343A3F; border-radius: 100%;"height="120px" width="120px"><br>
-            <strong>Abhishek Kumar (abhi_nitd)</strong><br>
+            <strong>Abhishek Kumar</strong><br>
             <small class="text-muted">Senior Coordinator</small>
           </center>
         </div>
 
         <div class="col-sm-4 col-md-2 col-lg-3">
           <center>
             <img class="head mt-3 mb-2 rounded-circle" src="../media/images/team/2 AbhishekhMithila.jpg" style="border: solid 5px #343A3F; border-radius: 100%;"height="120px" width="120px"><br>
-            <strong>Abhishek Kumar</strong><br>
+            <strong>Abhishek Kumar Chaudhary</strong><br>
             <small class="text-muted">Senior Coordinator</small>
           </center>
         </div>
 
         <div class="col-sm-4 col-md-2 col-lg-3">
           <center>
             <img class="head mt-3 mb-2 rounded-circle" src="../media/images/team/x.jpg" style="border: solid 5px #343A3F; border-radius: 100%;"height="120px" width="120px"><br>
-            <strong>Anupam Kr. Singh</strong><br>
+            <strong>Anupam Kumar Singh</strong><br>
             <small class="text-muted">Senior Coordinator</small>
           </center>
         </div>

website/interview_exp/admin.py

@@ -4,4 +4,8 @@
 
 @admin.register(Experiences)
 class ExperiencesAdmin(admin.ModelAdmin):
+    pass
+
+@admin.register(Revisions)
+class RevisionsAdmin(admin.ModelAdmin):
     pass

website/interview_exp/forms.py

@@ -1,11 +1,18 @@
-from django import forms
-from .models import *
-from django.contrib.auth.models import User
-
-class ExperienceForm(forms.ModelForm):
-    class Meta:
-        model = Experiences
-        fields = ['company', 'year', 'job_Profile', 'no_of_Rounds', 'interview_Questions', 'total_Compensation']
-
-class SearchForm(forms.Form):
-    key = forms.CharField(max_length=25)
+from django import forms
+from .models import *
+from django.contrib.auth.models import User
+from markdownx.fields import MarkdownxFormField
+
+class ExperienceForm(forms.ModelForm):
+    class Meta:
+        model = Experiences
+        interview_Questions = MarkdownxFormField()
+        fields = ['company', 'year', 'job_Profile', 'role_Type', 'no_of_Rounds', 'interview_Questions', 'total_Compensation']
+
+class SearchForm(forms.Form):
+    key = forms.CharField(max_length=25)
+
+class RevisionForm(forms.ModelForm):
+    class Meta:
+        model = Revisions
+        fields = ['message',]

website/interview_exp/models.py

@@ -2,6 +2,8 @@
 from django.contrib.auth.models import User
 import datetime
 from django.core.validators import MaxValueValidator, MinValueValidator
+from markdownx.models import MarkdownxField
+from markdownx.utils import markdownify
 
 # Create your models here.
 
@@ -16,20 +18,37 @@ class Experiences(models.Model):
     year = models.PositiveIntegerField(
         default=current_year(), validators=[MinValueValidator(1984), max_value_current_year])
     job_Profile = models.CharField(max_length=100)
+    role_Type_choices = (
+        ('Internship', 'Internship'),
+        ('Full Time', 'Full Time'),
+    )
+    role_Type = models.CharField(max_length=50, choices=role_Type_choices)
     user = models.ForeignKey(User, on_delete=models.CASCADE)
     no_of_Rounds = models.PositiveIntegerField(
         default=1, validators=[MinValueValidator(1)])
     interview_Questions = models.TextField()
+    interview_Questions = MarkdownxField()
     total_Compensation = models.PositiveIntegerField(
         blank=True, null=True
     )
+    verification_Status_choices = (
+        ('Approved', 'Approved'),
+        ('Review Pending', 'Review Pending'),
+        ('Changes Requested', 'Changes Requested'),
+    )
+    verification_Status = models.CharField(max_length=50, choices=verification_Status_choices, default='Review Pending')
+    verifier = models.ForeignKey(User, related_name='verifier', on_delete=models.SET_NULL, null=True)
     # TODO
     # AUTOGENERATE DATETIME
     created_at = models.DateTimeField(auto_now=False, auto_now_add=True)
     updated_at = models.DateTimeField(auto_now=True, auto_now_add=False)
 
+    @property
+    def formatted_markdown(self):
+        return markdownify(self.interview_Questions)
+            
     def __str__(self):
-        return self.company
+        return str(self.company) + " " + str(self.user)
 
     def get_cname(self):
         class_name = "Experiences"
@@ -40,3 +59,26 @@ class Meta:
         ordering = ['-created_at']
         db_table = 'experiences'
         verbose_name_plural = 'Experiences'
+
+
+class Revisions(models.Model):
+    experience = models.OneToOneField(Experiences, on_delete=models.CASCADE)
+    reviewer = models.ForeignKey(User, on_delete=models.CASCADE)
+    message = models.TextField()
+    # TODO
+    # AUTOGENERATE DATETIME
+    created_at = models.DateTimeField(auto_now=False, auto_now_add=True)
+    updated_at = models.DateTimeField(auto_now=True, auto_now_add=False)
+
+    def __str__(self):
+        return str(self.experience.company) + " " + str(self.reviewer)
+
+    def get_cname(self):
+        class_name = "Revisions"
+        return class_name
+
+    class Meta:
+        managed = True
+        ordering = ['-created_at']
+        db_table = 'revisions'
+        verbose_name_plural = 'Revisions'