diff --git a/fossee_manim/models.py b/fossee_manim/models.py index 273ebe6..00dab6a 100644 --- a/fossee_manim/models.py +++ b/fossee_manim/models.py @@ -96,6 +96,10 @@ ("released", "Released") ) +video_status=( + ("approved","video approval"), + ("pending","video pending") +) def has_profile(user): """ check if user has profile """ @@ -173,12 +177,14 @@ class Animation(models.Model): related_name="%(app_label)s_%(class)s_related") outline = models.TextField() status = models.CharField(max_length=255, choices=status) + video_upload_status = models.CharField(max_length=255,null=True,choices=video_status) category = models.ForeignKey(Category, on_delete=models.CASCADE) subcategory = models.CharField(max_length=255, blank=True) created = models.DateTimeField(default=timezone.now) tags = TaggableManager() history = HistoricalRecords() + def __str__(self): return u"{0} | {1}".format(self.title, self.status) diff --git a/fossee_manim/templates/fossee_manim/base.html b/fossee_manim/templates/fossee_manim/base.html index 06d7071..76a3615 100644 --- a/fossee_manim/templates/fossee_manim/base.html +++ b/fossee_manim/templates/fossee_manim/base.html @@ -108,14 +108,6 @@ - - - -
-
- -
-
{% endblock %} {% block content %} @@ -123,8 +115,6 @@

Base Template Content. Please override me

{% endblock %} - - {% block footer %} @@ -162,8 +152,8 @@

Base Template Content. Please override me

{% endblock footer %} - diff --git a/fossee_manim/views.py b/fossee_manim/views.py index 3732ce7..8168d77 100644 --- a/fossee_manim/views.py +++ b/fossee_manim/views.py @@ -286,6 +286,7 @@ def send_proposal(request): form_data = form.save(commit=False) form_data.contributor = user form_data.status = "pending" + form_data.video_upload_status = "pending" form.save() else: return render(request, 'fossee_manim/send_proposal.html', @@ -301,6 +302,7 @@ def send_proposal(request): @login_required def proposal_status(request): + val = 1; user = request.user if is_email_checked(user) and user.is_authenticated(): profile = Profile.objects.get(user_id=user) @@ -334,6 +336,7 @@ def proposal_status(request): @login_required def edit_proposal(request, proposal_id=None): user = request.user + print(proposal_id) if is_email_checked(user) and user.is_authenticated(): comment_form = CommentForm() proposal = Animation.objects.get(id=proposal_id) @@ -341,7 +344,9 @@ def edit_proposal(request, proposal_id=None): upload_form = UploadAnimationForm() categories = Category.objects.all() video = AnimationStats.objects.filter(animation=proposal_id) + if len(video)>0: + print("hai") msg = ('Previously a video was uploaded for '+ video[0].animation.title) else: msg = ('No video uploaded') @@ -356,12 +361,15 @@ def edit_proposal(request, proposal_id=None): status1 = request.POST.get('release') status2 = request.POST.get('rejected') status3 = request.POST.get('proposal_form') - - if status1 or status2 or status3 is not None: + status4=request.POST.get('approve_video') + if status1 or status2 or status3 or status4 is not None: if status1: proposal.status = 'released' send_email(request, call_on='released', contributor=proposal.contributor) + elif status4: + proposal.video_upload_status='approved' + proposal.status='changes' elif status3: send_email(request, call_on='proposal_form', contributor=proposal.contributor) @@ -382,7 +390,7 @@ def edit_proposal(request, proposal_id=None): form_data.animation = proposal form_data.animation_status = proposal.status if user.profile.position == 'reviewer': - proposal.status = 'changes' + # proposal.status = 'changes' proposal.save() send_email(request, call_on='changes', contributor=proposal.contributor,