From 405f885de3c51ef65d4a303a91ec33dc62f643fb Mon Sep 17 00:00:00 2001
From: HARSHADBHIRUD <71137195+HARSHADBHIRUD@users.noreply.github.com>
Date: Thu, 19 Nov 2020 15:14:18 +0530
Subject: [PATCH] Update views.py

---
 textutils/views.py | 145 ++++++++++++++++++++++++++++++---------------
 1 file changed, 98 insertions(+), 47 deletions(-)

diff --git a/textutils/views.py b/textutils/views.py
index 40cad6dd..8001f5ef 100644
--- a/textutils/views.py
+++ b/textutils/views.py
@@ -21,60 +21,111 @@ def analyze(request):
     #Check which checkbox is on
     if removepunc == "on":
         punctuations = '''!()-[]{};:'"\,<>./?@#$%^&*_~'''
-        analyzed = ""
-        for char in djtext:
+        str1 = ""
+        str2 = params['analyzed_text']
+        for char in str2:
             if char not in punctuations:
-                analyzed = analyzed + char
+                str1 = str1 + char
+        params['purpose'] = '|Removed Punctuations|'
+        params['analyzed_text'] = str1
+
+    if fullcaps == "on":
+        params['analyzed_text'] = params['analyzed_text'].upper()
+        params['analyzed_text'] = params['analyzed_text'].upper()
+        params['purpose'] = params['purpose'] + ' |changed to uppercase|'
+
+    if newlineremover == "on":
+        str1 = ''
+        str2 = params['analyzed_text']
+        for char in str2:
+            if char != "\n" and char != "\r":
+                str1 = str1 + char
+        params['analyzed_text'] = str1
+        params['purpose'] = params['purpose'] + ' |Removed NewLines|'
+
+    if extraspaceremover == "on":
+        str1 = ''
+        str2 = params['analyzed_text']
+        for indexs, char in enumerate(str2):
+            if not (str2[indexs] == " " and str2[indexs + 1] == " "):
+                str1 = str1 + char
+        params['analyzed_text'] = str1
+        params['purpose'] = params['purpose'] + ' |Removed Extra Spaces|'
+
+    if charcount == "on":
+        str2 = params['analyzed_text']
+        str1 = ('\n\nCharacter count of paragraph is ' + str(len(str2)))
+        params['purpose'] = params['purpose'] + ' |Counted Characters|'
+        params['analyzed_text'] = params['analyzed_text'] + str1
+
+    if removepunc == 'off' and fullcaps == 'off' and newlineremover == 'off' and extraspaceremover == 'off' and charcount == 'off':
+        return HttpResponse('Error')
+
+    else:
+        return render(request, 'analyze.html', params)
 
-        params = {'purpose':'Removed Punctuations', 'analyzed_text': analyzed}
-        djtext = analyzed
 
-    if(fullcaps=="on"):
-        analyzed = ""
-        for char in djtext:
-            analyzed = analyzed + char.upper()
-
-        params = {'purpose': 'Changed to Uppercase', 'analyzed_text': analyzed}
-        djtext = analyzed
-
-    if(extraspaceremover=="on"):
-        analyzed = ""
-        for index, char in enumerate(djtext):
-            # It is for if a extraspace is in the last of the string
-            if char == djtext[-1]:
-                    if not(djtext[index] == " "):
-                        analyzed = analyzed + char
-
-            elif not(djtext[index] == " " and djtext[index+1]==" "):                        
-                analyzed = analyzed + char
-
-        params = {'purpose': 'Removed NewLines', 'analyzed_text': analyzed}
-        djtext = analyzed
-
-    if (newlineremover == "on"):
-        analyzed = ""
-        for char in djtext:
-            if char != "\n" and char!="\r":
-                analyzed = analyzed + char
-
-        params = {'purpose': 'Removed NewLines', 'analyzed_text': analyzed}
+def about(request):
+    return render(request, 'about.html')
+
+def contact(request):
+    return render(request, 'about.html')
+#         punctuations = '''!()-[]{};:'"\,<>./?@#$%^&*_~'''
+#         analyzed = ""
+#         for char in djtext:
+#             if char not in punctuations:
+#                 analyzed = analyzed + char
+
+#         params = {'purpose':'Removed Punctuations', 'analyzed_text': analyzed}
+#         djtext = analyzed
+
+#     if(fullcaps=="on"):
+#         analyzed = djtext.upper()
+# #         for char in djtext:
+# #             analyzed = analyzed + char.upper()
+
+#         params = {'purpose': 'Changed to Uppercase', 'analyzed_text': analyzed}
+#         djtext = analyzed
+
+#     if(extraspaceremover=="on"):
+#         analyzed = ""
+#         for index, char in enumerate(djtext):
+#             # It is for if a extraspace is in the last of the string
+#             if char == djtext[-1]:
+#                     if not(djtext[index] == " "):
+#                         analyzed = analyzed + char
+
+#             elif not(djtext[index] == " " and djtext[index+1]==" "):                        
+#                 analyzed = analyzed + char
+
+#         params = {'purpose': 'Removed NewLines', 'analyzed_text': analyzed}
+#         djtext = analyzed
+
+#     if (newlineremover == "on"):
+#         analyzed = ""
+#         for char in djtext:
+#             if char != "\n" and char!="\r":
+#                 analyzed = analyzed + char
+
+#         params = {'purpose': 'Removed NewLines', 'analyzed_text': analyzed}
     
-    if (numberremover == "on"):
-        analyzed = ""
-        numbers = '0123456789'
+#     if (numberremover == "on"):
+#         analyzed = ""
+#         numbers = '0123456789'
 
-        for char in djtext:
-            if char not in numbers:
-                analyzed = analyzed + char
+#         for char in djtext:
+#             if char not in numbers:
+#                 analyzed = analyzed + char
         
-        params = {'purpose': 'Removed NewLines', 'analyzed_text': analyzed}
-        djtext = analyzed
+#         params = {'purpose': 'Removed NewLines', 'analyzed_text': analyzed}
+#         djtext = analyzed
 
     
-    if(removepunc != "on" and newlineremover!="on" and extraspaceremover!="on" and fullcaps!="on" and numberremover != "on"):
-        return HttpResponse("please select any operation and try again")
+#     if(removepunc != "on" and newlineremover!="on" and extraspaceremover!="on" and fullcaps!="on" and numberremover != "on"):
+#         return HttpResponse("please select any operation and try again")
 
-    return render(request, 'analyze.html', params)
+#     return render(request, 'analyze.html', params)
 
-def about(request):
-    return render(request, 'about.html')
\ No newline at end of file
+# def about(request):
+#     return render(request, 'about.html')
+#