IE field (selected/not selected) added

website/blog/forms.py

@@ -1,7 +1,7 @@
 from django import forms
 from .models import *
 from django.contrib.auth.models import User
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext_lazy as _
 import mimetypes
 from .validators import *
 from django.contrib.auth.forms import UserCreationForm

website/blog/urls.py

@@ -1,6 +1,6 @@
 from django.contrib import admin
 from django.urls import path,include
-from django.conf.urls import url, include
+from django.urls import include, re_path
 from .import views
 from django.conf import settings
 from django.conf.urls.static import static
@@ -26,5 +26,5 @@
     path('deletecomment_reply/<int:id>/', views.delete_reply_comment, name='delete_reply_comment'),
     path('filter/<int:id>/', views.filter_blog, name='filter_blog'),
     path('search/<str:key>', views.search_blog, name='search_blog'),
-    url(r'^markdownx/', include('markdownx.urls')),
+    re_path(r'^markdownx/', include('markdownx.urls')),
 ] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)

website/blog/validators.py

@@ -1,7 +1,7 @@
 from django import forms
 from .models import *
 from django.contrib.auth.models import User
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext_lazy as _
 import mimetypes
 
 VALID_IMAGE_EXTENSIONS = [

website/blog/views.py

@@ -25,7 +25,7 @@
 from django.utils.http import urlsafe_base64_encode
 from django.template.loader import render_to_string
 from django.utils.http import urlsafe_base64_encode, urlsafe_base64_decode
-from django.utils.encoding import force_bytes, force_text
+from django.utils.encoding import force_str
 from django.contrib import messages
 from django.contrib.auth import update_session_auth_hash
 from django.contrib.auth.forms import PasswordChangeForm

website/events/forms.py

@@ -3,7 +3,7 @@
 from django.contrib.auth.models import User
 from .validators import valid_url_extension
 from .validators import valid_url_mimetype
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext_lazy as _
 from markdownx.fields import MarkdownxFormField
 import mimetypes
 import pytz,datetime

website/events/urls.py

@@ -1,6 +1,6 @@
 from django.urls import path
 from .views import *
-from django.conf.urls import include,url
+from django.urls import include, re_path
 from django.conf import settings
 from django.conf.urls.static import static
 
@@ -13,5 +13,5 @@
     path('update/<int:event_id>/', event_update, name='event_update'),
     path('upcoming_list/',upcoming_events, name='upcoming_events'),
     path('',events, name='events'),
-    url(r'^markdownx/', include('markdownx.urls')),
+    re_path(r'^markdownx/', include('markdownx.urls')),
 ] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)

website/events_calendar/forms.py

@@ -1,7 +1,7 @@
 from django import forms
 from .models import *
 from django.contrib.auth.models import User
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext_lazy as _
 from markdownx.fields import MarkdownxFormField
 import mimetypes
 import pytz,datetime

website/events_calendar/urls.py

@@ -1,6 +1,6 @@
 from django.urls import path
 from .views import *
-from django.conf.urls import include,url
+from django.urls import include, re_path
 from django.conf import settings
 from django.conf.urls.static import static
 
@@ -11,5 +11,5 @@
                   path('detail/<int:event_id>/', event_detail, name='event_detail'),
                   path('update/<int:event_id>/', event_update, name='event_update'),
                   path('filter/<str:type>', filter_event, name='filter_event'),
-                  url(r'^markdownx/', include('markdownx.urls')),
+                  re_path(r'^markdownx/', include('markdownx.urls')),
               ] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)

website/forum/forms.py

@@ -1,7 +1,7 @@
 from django import forms
 from .models import *
 from django.contrib.auth.models import User
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext_lazy as _
 import mimetypes
 from .validators import *
 from django.contrib.auth.forms import UserCreationForm

website/forum/urls.py

@@ -1,6 +1,6 @@
 from django.urls import path
 from .views import *
-from django.conf.urls import include,url
+from django.urls import include, re_path
 from django.conf import settings
 from django.conf.urls.static import static
 from user_profile import urls
@@ -30,5 +30,5 @@
     path('deletecomment_answer/<int:id>/', delete_answer_comment, name='delete_answer_comment'),
     path('filter/<int:id>/', filter_question, name='filter_question'),
     path('search/<str:key>', search_question, name='search_question'),
-    url(r'^markdownx/', include('markdownx.urls')),
+    re_path(r'^markdownx/', include('markdownx.urls')),
 ] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)

website/forum/validators.py

@@ -1,7 +1,7 @@
 from django import forms
 from .models import *
 from django.contrib.auth.models import User
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext_lazy as _
 import mimetypes
 
 

website/forum/views.py

@@ -28,7 +28,7 @@
 from .tokens import account_activation_token
 from .tokens import password_reset_token
 from django.utils.http import urlsafe_base64_encode, urlsafe_base64_decode
-from django.utils.encoding import force_bytes, force_text
+from django.utils.encoding import force_str
 from django.contrib import messages
 from django.contrib.auth import update_session_auth_hash
 from django.contrib.auth.forms import PasswordChangeForm

website/getting_started/urls.py

@@ -1,6 +1,6 @@
 from django.urls import path
 from .views import * 
-from django.conf.urls import include, url
+from django.urls import include, re_path
 from django.conf import settings
 from django.conf.urls.static import static
 

website/interview_exp/api/serializers.py

@@ -13,7 +13,7 @@ class IESerializer(serializers.ModelSerializer):
     class Meta:
         model = Experiences
         fields = '__all__'
-        read_only_fields = ['user', 'created_at', 'updated_at', 'verifier']
+        read_only_fields = ['user', 'created_at', 'updated_at', 'verifier', 'selected']
 
 
 class RevisionSerializer(serializers.ModelSerializer):
@@ -33,4 +33,4 @@ class RevisionSerializer(serializers.ModelSerializer):
     class Meta:
         model = Revisions
         fields = '__all__'
-        read_only_fields = ['created_at', 'updated_at', 'id', 'reviewer']
+        read_only_fields = ['created_at', 'updated_at', 'id', 'reviewer', 'selected']

website/interview_exp/api/views.py

@@ -43,7 +43,7 @@ class IEListView(ListCreateAPIView):
     serializer_class = IESerializer
     filter_backends = (filters.DjangoFilterBackend, SearchFilter, OrderingFilter)
     filterset_class = ExperiencesFilter
-    search_fields = ['company', 'user__username', 'year']
+    search_fields = ['company', 'user__username', 'year','selected']    
     ordering_fields = ['updated_at', 'total_Compensation', 'year']
 
     def get_queryset(self):

website/interview_exp/forms.py

@@ -7,7 +7,7 @@ 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']
+        fields = ['company', 'year', 'job_Profile', 'role_Type', 'no_of_Rounds', 'interview_Questions', 'total_Compensation', 'selected']
 
 class SearchForm(forms.Form):
     key = forms.CharField(max_length=25)

website/interview_exp/models.py

@@ -47,6 +47,7 @@ class Experiences(ExportModelOperationsMixin('experience'), models.Model):
     # AUTOGENERATE DATETIME
     created_at = models.DateTimeField(auto_now=False, auto_now_add=True)
     updated_at = models.DateTimeField(auto_now=True, auto_now_add=False)
+    selected = models.BooleanField(default = True)    
 
     @property
     def formatted_markdown(self):

website/interview_exp/templates/exp_detail.html

@@ -52,7 +52,7 @@
                                 <p>{{ experience.formatted_markdown | safe }}</p>
                                 <p class="card-text">
                                     <i>
-                                        <img src="{{ profile.image.url }}" width="5%" height="5%" style="border-radius: 30px; float: left;" alt="img">
+                                        {% comment %} <img src="{{ profile.image.url }}" width="5%" height="5%" style="border-radius: 30px; float: left;" alt="img"> {% endcomment %}
                                         <small class="mb-0" style="position:relative; top:15px;">
                                           &nbsp
                                             <a href="{% url 'user_profile:view_profile' experience.user.id  %}">{{experience.user}}</a>
@@ -82,6 +82,8 @@
                                     <li title="Job Profile"><i class="fas fa-user-tie btn btn-light mb-1"></i>&nbsp {{ experience.job_Profile }}</li>
                                     <li title="Year"><i class="fas fa-calendar-alt btn btn-light mb-1"></i>&nbsp {{ experience.year }}</li>
                                     <li title="Rounds"><i class="fas fa-user-edit btn btn-light mb-1"></i>&nbsp {{ experience.no_of_Rounds }}</li>
+                                    {% comment %} <li title="selected"><i class="fas fa-user-edit btn btn-light mb-1"></i>&nbsp {{ experience.selected }}</li> {% endcomment %}
+
 
                                 </ul>
                         </div>

website/interview_exp/urls.py

@@ -1,6 +1,6 @@
 from django.urls import path
 from .views import *
-from django.conf.urls import include,url
+from django.urls import include, re_path
 from django.conf import settings
 from django.conf.urls.static import static
 

website/interview_exp/views.py

@@ -44,7 +44,8 @@ def add_experience(request):
 
     return render(request, 'experience-form.html', {'form': form})
 
-
+def is_ajax(request):
+    return request.META.get('HTTP_X_REQUESTED_WITH') == 'XMLHttpRequest'
 @login_required
 def update_experience(request, id):
     current_user_profile = Profile.objects.get(user = request.user)
@@ -133,7 +134,7 @@ def list_experiences(request):
     ie_count = len(experiences)
     profiles = Profile.objects.all()
     args = {'form_search':search, 'profile':profiles, 'experiences': experiences_list, 'ie_count':ie_count}
-    if request.is_ajax():
+    if is_ajax(request):
         return render(request, 'exp_list.html', args)
     return render(request, 'experiences.html', args)
 

website/team/urls.py

@@ -1,6 +1,6 @@
 from django.urls import path
 from .views import *
-from django.conf.urls import include,url
+from django.urls import include, re_path
 from django.conf import settings
 from django.conf.urls.static import static
 

website/user_profile/forms.py

@@ -1,7 +1,7 @@
 from django import forms
 from .models import *
 from django.contrib.auth.models import User
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext_lazy as _
 import mimetypes
 from .validators import *
 from django.contrib.auth.forms import UserCreationForm

website/user_profile/urls.py

@@ -1,6 +1,6 @@
 from django.urls import path
 from .views import *
-from django.conf.urls import include,url
+from django.urls import include, re_path
 from django.conf import settings
 from django.conf.urls.static import static
 
@@ -22,5 +22,5 @@
     path('register/email_check', email_check,name="email_check"),
     path('editprofile/', edit_profile, name='edit_profile'),
     path('search-user/', search_user, name='search_user'),
-    url(r'^markdownx/', include('markdownx.urls')),
+    re_path(r'^markdownx/', include('markdownx.urls')),
 ] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)

website/user_profile/validators.py

@@ -1,7 +1,7 @@
 from django import forms
 from .models import *
 from django.contrib.auth.models import User
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext_lazy as _
 import mimetypes
 
 

website/user_profile/views.py

@@ -25,7 +25,7 @@
 from .tokens import account_activation_token
 from .tokens import password_reset_token
 from django.utils.http import urlsafe_base64_encode, urlsafe_base64_decode
-from django.utils.encoding import force_bytes, force_text
+from django.utils.encoding import force_str
 from django.contrib import messages
 from django.contrib.auth import update_session_auth_hash
 from django.contrib.auth.forms import PasswordChangeForm

website/website/urls.py

@@ -16,7 +16,7 @@
 from django.contrib import admin
 from django.contrib.auth import views as auth_views
 from django.urls import path, include
-from django.conf.urls import url, include
+from django.urls import include, re_path
 from forum import views
 from django.conf import settings
 from django.conf.urls.static import static
@@ -42,7 +42,7 @@
                   path('experience/', include('interview_exp.urls', namespace='interview_exp')),
                   path('get_started/', include('getting_started.urls', namespace='getting_started')),
                   # path('members/',include('members.urls')),
-                  url(r'^markdownx/', include('markdownx.urls')),
+                  re_path(r'^markdownx/', include('markdownx.urls')),
 
                   # API region