[#609] Promote request response to member (#617)

609:RequestForManager [#609] language_attribut channged back to its original [#609] language_attribut channged back to its original and new language added to other language.txt [#609] language_attribut channged back to its original and new language added to other language.txt and console.log function removed from mail view and memberform
open-learning-exchange · Feb 9, 2017 · ffcede2 · ffcede2
1 parent 148aa60
commit ffcede2
Show file tree

Hide file tree

Showing 10 changed files with 71 additions and 12 deletions.
diff --git a/app/MyApp/app/Home-Urdu.css b/app/MyApp/app/Home-Urdu.css
@@ -20,6 +20,8 @@
 }
 #PromoteToManager{
     margin-right:170px;
+    margin-top:-90px;
+    margin-right:17px;
 }
 .resourcInfoFirstCol{
     colspan:4;
@@ -654,6 +656,7 @@ body{
 }
 #AddCourseMainDiv{
     direction: rtl;
+    margin-right:17px; 
 }
 #collectionTable{
     direction: rtl;

diff --git a/app/MyApp/app/Home.css b/app/MyApp/app/Home.css
@@ -24,8 +24,9 @@ select#onDashboardLanguage {
 	background-color: #e1e1e1;
 }
 #PromoteToManager{
-	margin-top:-40px;
-	margin-left:170px;
+	margin-top:-90px;
+	margin-bottom: 25px;
+	margin-left:17px;
 }
 #manageOnCourseProgress{
 	margin-left:84px;

diff --git a/app/MyApp/app/tabl.css b/app/MyApp/app/tabl.css
@@ -193,8 +193,9 @@ bbf-form ul{border: 5px solid;}
     color:red;
 }
 .signup-submit {
-    margin-top: -25px;
-    margin-left: 440px;
+    margin-top: -4px;
+    margin-left: 0px;
+    text-align: auto;
 }
 .signup-btn.btn {
     background-color: #1ABC9C;

diff --git a/app/MyApp/app/views/MailView.js b/app/MyApp/app/views/MailView.js
@@ -86,6 +86,8 @@ $(function() {
                 mmodel.fetch({
                     async: false
                 })
+
+                var username = mmodel.attributes.firstName+" "+mmodel.attributes.lastName
                 roles = mmodel.get('roles');
                 if (roles.indexOf('Manager') < 0) {
                     roles.push("Manager");// if promote to manager checkbox is ticked
@@ -100,12 +102,54 @@ $(function() {
                         return
                     }
                 });
+                var temp
+                var that = this
+                var currentdate = new Date();
+
+
+                    var mailBody = App.languageDict.attributes.Hi + ',<br>' + ' <b>' + username + '</b> ' + ',<br>' + App.languageDict.attributes.Your_Request_Has_Been_Accepted;
+                    temp = new App.Models.Mail()
+                    temp.set("senderId", $.cookie('Member._id'))
+                    temp.set("receiverId", mmodel.get('_id'));
+                    temp.set("status", "0")
+                    temp.set("subject", App.languageDict.attributes.Manager_Request + " | " + username)
+                    temp.set("type", "manager-request")
+                    temp.set("body", mailBody)
+                    temp.set("sendDate", currentdate)
+                    temp.set("entityId",mmodel.get('_id'))
+                    temp.save()
+
+
+
+
             },
             "click #promote-reject": function (e) {
                 var body = mailView.inViewModel.get('body').replace("<br>", "||br||").replace(/<(?:.|\n)*?>/gm, '')
                 body = body.replace('Accept', '').replace('Reject', '').replace('&nbsp;&nbsp;', '').replace("||br||", "<br>")
-                mailView.updateMailBody(body)
-                alert(App.languageDict.attributes.Promote_Request_Rejected)
+                mailView.updateMailBody(body) 
+                var mmodel = new App.Models.Member({
+                    _id: e.currentTarget.value
+                })
+                mmodel.fetch({
+                    async: false
+                })
+                var username = mmodel.attributes.firstName+" "+mmodel.attributes.lastName;
+                var temp
+                var that = this
+                var currentdate = new Date();
+                var mailBody = App.languageDict.attributes.Hi + ',<br>' + ' <b>' + username + '</b> ' + ',<br>' + App.languageDict.attributes.Your_Request_Has_Been_Rejected;
+                temp = new App.Models.Mail()
+                temp.set("senderId", $.cookie('Member._id'))
+                temp.set("receiverId",  mmodel.get('_id'));
+                temp.set("status", "0")
+                temp.set("subject", App.languageDict.attributes.Manager_Request + " | " + username)
+                temp.set("type", "manager-request")
+                temp.set("body", mailBody)
+                temp.set("sendDate", currentdate)
+                temp.set("entityId", mmodel.get('_id'))
+                temp.save()
+                alert(App.languageDict.attributes.Promote_Request_Rejected)   
+
             },
             "click #invite-accept": function(e) {
                 if (mailView.inViewModel.get('type') == "admissionRequest") {

diff --git a/app/MyApp/app/views/MemberForm.js b/app/MyApp/app/views/MemberForm.js
@@ -223,7 +223,7 @@ $(function() {
                 } else {
                     buttonText = App.languageDict.attributes.Register
                 }
-                if(this.model.id == $.cookie('Member._id') && this.model.get('roles').indexOf('Manager') < 0) {
+                if(this.model.id != undefined && this.model.id == $.cookie('Member._id') && this.model.get('roles').indexOf('Manager') < 0) {
                     promoteBtn = '<a class="btn btn-success" id="formManagarRequest" style="margin-top: 10px;">'+App.languageDict.attributes.Manager_Request+'</a>';
                 } else {
                     promoteBtn = '';

diff --git a/init_docs/Text.json b/init_docs/Text.json
@@ -836,5 +836,7 @@
   "Confirm_Course": "Are you sure you want to delete this Course?",
   "Has_Requested_Promote":  "has requested to be promoted for 'Manager' access.",
   "Promote_Request_Rejected":  "Request to promote has been rejected.",
-  "Promote_Request_Accepted":  "Member has been successfully promoted."
+  "Promote_Request_Accepted":  "Member has been successfully promoted.",
+  "Your_Request_Has_Been_Accepted":  "Your Request Has Been Accepted",
+  "Your_Request_Has_Been_Rejected":  "Your Request Has Been Rejected"
 }
diff --git a/init_docs/languages/Arabic.txt b/init_docs/languages/Arabic.txt
@@ -838,5 +838,7 @@
   "Prompt_MeetUp_save":"Meetup saved! Do you want to invite?",
   "Has_Requested_Promote":  "has requested to be promoted for 'Manager' access.",
   "Promote_Request_Rejected":  "Request to promote has been rejected.",
-  "Promote_Request_Accepted":  "Member has been successfully promoted."
+  "Promote_Request_Accepted":  "Member has been successfully promoted.",
+  "Your_Request_Has_Been_Accepted":  "Your Request Has Been Accepted",
+  "Your_Request_Has_Been_Rejected":  "Your Request Has Been Rejected"
 }
diff --git a/init_docs/languages/English.txt b/init_docs/languages/English.txt
@@ -836,5 +836,7 @@
   "Confirm_Course":"Are you sure you want to delete this Course?",
   "Has_Requested_Promote":  "has requested to be promoted for 'Manager' access.",
   "Promote_Request_Rejected":  "Request to promote has been rejected.",
-  "Promote_Request_Accepted":  "Member has been successfully promoted."
+  "Promote_Request_Accepted":  "Member has been successfully promoted.",
+  "Your_Request_Has_Been_Accepted":  "Your Request Has Been Accepted",
+  "Your_Request_Has_Been_Rejected":  "Your Request Has Been Rejected"
 }
diff --git a/init_docs/languages/Spanish.txt b/init_docs/languages/Spanish.txt
@@ -836,5 +836,7 @@
   "Prompt_MeetUp_save":"Meetup saved! Do you want to invite?",
   "Has_Requested_Promote":  "has requested to be promoted for 'Manager' access.",
   "Promote_Request_Rejected":  "Request to promote has been rejected.",
-  "Promote_Request_Accepted":  "Member has been successfully promoted."
+  "Promote_Request_Accepted":  "Member has been successfully promoted.",
+  "Your_Request_Has_Been_Accepted":  "Your Request Has Been Accepted",
+  "Your_Request_Has_Been_Rejected":  "Your Request Has Been Rejected"
 }
diff --git a/init_docs/languages/Urdu.txt b/init_docs/languages/Urdu.txt
@@ -848,5 +848,7 @@
   "Prompt_MeetUp_save":"Meetup saved! Do you want to invite?",
   "Has_Requested_Promote":  "has requested to be promoted for 'Manager' access.",
   "Promote_Request_Rejected":  "Request to promote has been rejected.",
-  "Promote_Request_Accepted":  "Member has been successfully promoted."
+  "Promote_Request_Accepted":  "Member has been successfully promoted.",
+  "Your_Request_Has_Been_Accepted":  "Your Request Has Been Accepted",
+  "Your_Request_Has_Been_Rejected":  "Your Request Has Been Rejected"
 }