From 62bb6838a3e65582e79ab973b5afa4928080245c Mon Sep 17 00:00:00 2001
From: Raju Chaudhary <razu_latakta@hotmail.com>
Date: Thu, 10 Aug 2017 16:16:29 +0545
Subject: [PATCH 1/4] [#981] Review and Credit for members

---
 app/MyApp/app/Router.js                       | 73 +++++++++++--------
 .../app/collections/membercourseprogresses.js |  9 ++-
 app/MyApp/app/views/CreditsLeaderView.js      | 19 +++--
 app/MyApp/app/views/CreditsTable.js           |  2 +-
 databases/membercourseprogress.js             |  7 ++
 5 files changed, 65 insertions(+), 45 deletions(-)

diff --git a/app/MyApp/app/Router.js b/app/MyApp/app/Router.js
index 02f90000d..8fce8452a 100644
--- a/app/MyApp/app/Router.js
+++ b/app/MyApp/app/Router.js
@@ -422,22 +422,26 @@ $(function() {
             $('#creditsMainTable').append('<h3>' + 'Course Credits' + '</h3>');
             creditsView.addHeading();
             var count=0;
-            var courses = new App.Collections.Courses();
+            var courses = new App.Collections.membercourseprogresses();
             courses.fetch({
                 async:false,
                 success: function (courseDocs) {
+                    console.log(courseDocs)
                     if(courseDocs.length>0){
+                        var mem_list=[]
+                        var course_list=[]
                         for(var i=0;i<courseDocs.length;i++) {
-                            if(courseDocs.models[i].get('_id') != '_design/bell') {
-                                var doc = courseDocs.models[i];
-                                var learnerIds = getCountOfLearners(doc.get('_id'), true);
-                                console.log(learnerIds);
-                                if(learnerIds.length>0){
-                                    creditsView.courseId=doc.get('_id');
-                                    creditsView.learnerIds = learnerIds;
-                                    creditsView.render();
-                                }
+                            if(courseDocs.models[i].id != '_design/bell') {
+                                mem_list.push({"courseId": courseDocs.models[i].attributes.courseId, "MemberId" : courseDocs.models[i].attributes.memberId})
+                            }
+                        }
+                        console.log(mem_list)
+                        if(mem_list.length > 0){
+                            for(var i = 0 ; i < mem_list.length; i++){
+                                creditsView.courseId= mem_list[i].courseId;
+                                creditsView.mem_list = mem_list;
                             }
+                            creditsView.render();
                         }
                     }
                 }
@@ -522,7 +526,7 @@ $(function() {
             {
                 if(learnerCollection.length > 0)
                 {
-                    memberId = learnerCollection.models[0].get("_id");
+                    memberId = learnerCollection[0].get("_id");
                 }
             }
             if(!memberId)
@@ -546,19 +550,18 @@ $(function() {
                 App.$el.children('.body').html('<div id="creditsTable" style = "margin-right:20px; margin-left:20px;"></div>');
                 var select = $("<select id='learnerSelector' onchange='getName($(this).val())'>");
                 var name, id;
-                learnerCollection.each(
-                    function(member) {
-                        var learnerName;
-                        if(member.get('firstName') ) {
-                            name = member.get('firstName')+ " " +member.get('lastName')
-                            id = member.get('_id')
+                for(var i = 0; i < learnerCollection.length; i++){
+                    var learnerName;
+                    if(learnerCollection[i].get('firstName') ) {
+                            name = learnerCollection[i].get('firstName')+ " " +learnerCollection[i].get('lastName')
+                            id = learnerCollection[i].get('_id')
 
                         }
                         if(name ){
                             select.append("<option value="+id +"/"+courseId+">" +name+"</option>");
                         }
+                }
 
-                    });
                 if(courseId && memberId){
                     select.val(memberId + '/' + courseId)
                 }
@@ -703,20 +706,26 @@ $(function() {
         },
 
         getLearnersList: function(courseId) {
-            var learnerIds = getCountOfAllLearnersOrIds(courseId, true);
-            var learnerModelIdes = ''
-            _.each(learnerIds, function(item) {
-                learnerModelIdes += '"' + item + '",';
-            })
-            if (learnerModelIdes != ''){
-                learnerModelIdes = learnerModelIdes.substring(0, learnerModelIdes.length - 1);
-            }
-            var membersColl = new App.Collections.Members();
-            membersColl.keys = encodeURI(learnerModelIdes)
-            membersColl.fetch({
-                async: false
-            });
-            return membersColl;
+             var mcp = new App.Collections.membercourseprogresses()
+             mcp.courseId = courseId
+             mcp.fetch({async:false});
+             if(mcp.length > 0){
+                var mem_list = []
+                for(var i=0;i<mcp.length;i++){
+                    mem_list.push(mcp.models[i].attributes.memberId)
+                }
+                if(mem_list.length > 0){
+                        var newmem_list = []
+                        for(var i = 0; i < mem_list.length; i++){
+                            var mem = new App.Models.Member({
+                                _id: mem_list[i]
+                            })
+                            mem.fetch({async:false})
+                            newmem_list.push(mem)
+                        }
+                        return newmem_list
+               }
+           }
         },
 
         showLearnersListForCredits: function (courseId) {
diff --git a/app/MyApp/app/collections/membercourseprogresses.js b/app/MyApp/app/collections/membercourseprogresses.js
index d36279256..ac7a304b5 100644
--- a/app/MyApp/app/collections/membercourseprogresses.js
+++ b/app/MyApp/app/collections/membercourseprogresses.js
@@ -4,8 +4,13 @@ $(function() {
 
 
         url: function() {
-            var url = App.Server + '/membercourseprogress/_design/bell/_view/GetMemberCourseResult?key=["' + this.memberId + '","' + this.courseId + '"]&include_docs=true'
-            return url
+            if(this.courseId && this.memberId)
+                var url = App.Server + '/membercourseprogress/_design/bell/_view/GetMemberCourseResult?key=["' + this.memberId + '","' + this.courseId + '"]&include_docs=true'
+            else if(this.courseId)
+                var url = App.Server + '/membercourseprogress/_design/bell/_view/GetMemberByCourseID?key="' + this.courseId + '"&include_docs=true'
+            else
+                return App.Server + '/membercourseprogress/_all_docs?include_docs=true'
+                return url
         },
 
 
diff --git a/app/MyApp/app/views/CreditsLeaderView.js b/app/MyApp/app/views/CreditsLeaderView.js
index fe4cc104e..446fedc73 100644
--- a/app/MyApp/app/views/CreditsLeaderView.js
+++ b/app/MyApp/app/views/CreditsLeaderView.js
@@ -16,29 +16,28 @@ $(function () {
         render: function () {
             var that = this;
             var unsortedData = []; var jsonArr = [];
-            var courseModel = new App.Models.Course({
-                _id: this.courseId
-            })
-            courseModel.fetch({
-                async: false
-            });
-            for (var m = 0; m < that.learnerIds.length; m++) {
-                var memberId = that.learnerIds[m];
+            for (var m = 0; m < that.mem_list.length; m++) {
+                 var courseModel = new App.Models.Course({
+                    _id: that.mem_list[m].courseId
+                })
+                courseModel.fetch({
+                    async: false
+                });
+                var memberId = that.mem_list[m].MemberId;
                 var member = new App.Models.Member({
                     "_id": memberId
                 })
                 member.fetch({
                     async: false
                 })
+                console.log(member)
                 var MemberCourseProgress = new App.Collections.membercourseprogresses();
                 var stepsStatuses; var indexOfStepId = []; var stepIds = [];
                 var memberName = member.get('firstName') + " " + member.get('lastName')
                 MemberCourseProgress.courseId = that.courseId;
                 MemberCourseProgress.memberId = memberId;
-                console.log(memberId);
                 MemberCourseProgress.fetch({
                     success: function (progressDoc) {
-                        console.log(progressDoc);
                         if (progressDoc.models.length > 0) {
                             stepsStatuses = progressDoc.models[0].get('stepsStatus');
                             stepsAttempt = progressDoc.models[0].get('pqAttempts');
diff --git a/app/MyApp/app/views/CreditsTable.js b/app/MyApp/app/views/CreditsTable.js
index 14b1253fe..db19aeda6 100644
--- a/app/MyApp/app/views/CreditsTable.js
+++ b/app/MyApp/app/views/CreditsTable.js
@@ -19,7 +19,7 @@ $(function () {
 
         addAll: function() {
             var that = this;
-            courseProgress = new App.Collections.membercourseprogresses()
+            var courseProgress = new App.Collections.membercourseprogresses()
             courseProgress.memberId = this.memberId;
             courseProgress.courseId = this.courseId;
             courseProgress.fetch({
diff --git a/databases/membercourseprogress.js b/databases/membercourseprogress.js
index 3f16d4ccf..5e550c740 100644
--- a/databases/membercourseprogress.js
+++ b/databases/membercourseprogress.js
@@ -27,6 +27,13 @@ ddoc.views = {
       }
     }
   },
+  GetMemberByCourseID: {
+    map: function(doc) {
+      if (doc.courseId) {
+        emit(doc.courseId, doc.memberId)
+      }
+    }
+  },
   GetMemberCourseResult: {
     map: function(doc) {
       if (doc.memberId && doc.courseId) {

From 0ac822f964c7154002def0cf50ce68f44a825976 Mon Sep 17 00:00:00 2001
From: Raju Chaudhary <razu_latakta@hotmail.com>
Date: Fri, 11 Aug 2017 11:26:02 +0545
Subject: [PATCH 2/4] [981] Course Statistics for members

---
 app/MyApp/app/Router.js                  | 13 +----
 app/MyApp/app/views/CoursesStatistics.js | 70 ++++++++++++------------
 app/MyApp/index.html                     |  3 -
 3 files changed, 37 insertions(+), 49 deletions(-)

diff --git a/app/MyApp/app/Router.js b/app/MyApp/app/Router.js
index 8fce8452a..5c82eae9c 100644
--- a/app/MyApp/app/Router.js
+++ b/app/MyApp/app/Router.js
@@ -2400,17 +2400,8 @@ $(function() {
         },
 
         CourseStatistics: function (cId){
-            var course = new App.Models.Course();
-            course.id = cId
-            course.fetch({
-                async: false
-            })
-            var coursestatisticview = new App.Views.CoursesStatistics({
-                  model:course,
-                  attributes:{
-                    courseid:  cId
-                  }
-                 });
+            var coursestatisticview = new App.Views.CoursesStatistics();
+            coursestatisticview.courseId = cId;
             coursestatisticview.render()
             App.$el.children('.body').html('<div id="couarsestat"></div>');
             $('#couarsestat').append('<div><h2>'+App.languageDict.attributes.Course_Progress_Statistics+'</h2></div>')
diff --git a/app/MyApp/app/views/CoursesStatistics.js b/app/MyApp/app/views/CoursesStatistics.js
index 7f5963d93..417cb73d0 100644
--- a/app/MyApp/app/views/CoursesStatistics.js
+++ b/app/MyApp/app/views/CoursesStatistics.js
@@ -18,44 +18,43 @@ $(function() {
             var stepid = []
             var totalerrors = []
             var totalFailStatus = []
+            var pqattempts=[]
 
-               for(var i = 0; i <this.model.attributes.members.length; i++){
-                    var statisticscourseProgress = new App.Collections.membercourseprogresses()
-                    statisticscourseProgress.memberId = this.model.attributes.members[i];
-                    statisticscourseProgress.courseId = this.attributes.courseid;
-                    statisticscourseProgress.fetch({
-                        async:false
-                    });
-                    memberStep = statisticscourseProgress.models[0].attributes.stepsIds
-                    membersstatus = statisticscourseProgress.models[0].attributes.stepsStatus
-                    var pqattempts = statisticscourseProgress.models[0].attributes.pqAttempts
-                    var member = statisticscourseProgress.models[0].attributes.memberId
-                    var failarr = []
-                    var arr = 0
-                    var arrtotalerrors = []
-                    for (var k = 0; k < memberStep.length; k++)
-                    {
-                        var count = 0
-                        for(var j = 1; j <= pqattempts[k]; j++){
-                           if (membersstatus[k][j] == "0")
-                            {
-                                count++
+                var statisticscourseProgress = new App.Collections.membercourseprogresses()
+                statisticscourseProgress.courseId = this.courseId
+                statisticscourseProgress.fetch({
+                    async:false,
+                })
+                if(statisticscourseProgress.length > 0){
+                    for (var i = 0; i < statisticscourseProgress.length; i++){
+                        statisticscourseProgress.memberId = statisticscourseProgress.models[i].attributes.memberId;
+                        memberStep = statisticscourseProgress.models[0].attributes.stepsIds
+                        membersstatus = statisticscourseProgress.models[0].attributes.stepsStatus
+                        pqattempts = statisticscourseProgress.models[0].attributes.pqAttempts
+                        var failarr = []
+                        var arr = 0
+                        var arrtotalerrors = []
+                        for (var k = 0; k < memberStep.length; k++){
+                            var count = 0
+                            for (var j = 0; j <= pqattempts[k]; j++){
+                                if(membersstatus[k][j] == "0"){
+                                    count++
+                                }
                             }
+                            arr = count + arr
+                            failarr.push(count)
                         }
-                        arr =count + arr
-                        failarr.push(count)
+                        totalerrors.push(arr)
+                        totalFailStatus.push(failarr)
+                        var members =  new App.Models.Member({
+                            _id: statisticscourseProgress.models[i].attributes.memberId
+                        })
+                        members.fetch({
+                            async: false
+                        })
+                        memberName.push(members.toJSON().firstName + ' ' + members.toJSON().lastName)
                     }
-                    totalerrors.push(arr)
-                    totalFailStatus.push(failarr)
-                    var members = new App.Models.Member({
-                        _id: member
-                    })
-                    members.fetch({
-                        async: false
-                    });
-                    memberName.push(members.toJSON().firstName + ' ' + members.toJSON().lastName)
-                }
-                for (var y = 0; y < memberStep.length; y++) {
+                    for (var y = 0; y < memberStep.length; y++) {
                         var courseSteps = new App.Models.CourseStep()
                         courseSteps.id = memberStep[y];
                         courseSteps.fetch({
@@ -67,7 +66,7 @@ $(function() {
                 var totalMemberstepError = []
                 for (var q = 0; q < memberStep.length; q++) {
                      var total = 0
-                    for (var p = 0; p< this.model.attributes.members.length; p++) {
+                    for (var p = 0; p< members.attributes.length; p++) {
                         total = total + totalFailStatus[p][q]
                     }
                     totalMemberstepError.push(total)
@@ -81,6 +80,7 @@ $(function() {
                 this.vars.Totalerrors = totalerrors;
                 this.vars.TotalmemberSteperror = totalMemberstepError
                 this.$el.html(_.template(this.template,this.vars))
+                }
         }
     })
 })
diff --git a/app/MyApp/index.html b/app/MyApp/index.html
index 26bbce0d6..e7bb987b5 100644
--- a/app/MyApp/index.html
+++ b/app/MyApp/index.html
@@ -1114,9 +1114,6 @@ <h3><%=languageDict.attributes.Configurations%></h3>
             <%=App.languageDict.attributes.Your_Answer_Has_Been_Reviewed%>
         <%}%>
         </td>
-        <td>
-        </td>
-       
     </script>
 
     <script type="text/html" id="template-CourseRow">

From 60a23e7f707c15809bf75f1aa9371469cac5a8e8 Mon Sep 17 00:00:00 2001
From: Raju Chaudhary <razu_latakta@hotmail.com>
Date: Mon, 14 Aug 2017 16:24:20 +0545
Subject: [PATCH 3/4] [981] community filter added in credit

---
 app/MyApp/app/Router.js                  | 49 ++++++++++++++-
 app/MyApp/app/views/CreditsLeaderView.js | 77 +++++++++++++++++++++++-
 2 files changed, 122 insertions(+), 4 deletions(-)

diff --git a/app/MyApp/app/Router.js b/app/MyApp/app/Router.js
index 5c82eae9c..a433586a8 100644
--- a/app/MyApp/app/Router.js
+++ b/app/MyApp/app/Router.js
@@ -420,13 +420,59 @@ $(function() {
             var creditsView = new App.Views.CreditsLeaderView();
             App.$el.children('.body').html('<div id="creditsMainTable"></div>');
             $('#creditsMainTable').append('<h3>' + 'Course Credits' + '</h3>');
+            var CoursecommunityList = "";
+            if(App.configuration.get('type') == 'nation'){
+                $.ajax({
+                    url: '/community/_design/bell/_view/getCommunityByCode',
+                    type: 'GET',
+                    dataType: "jsonp",
+                    async: false,
+                    success: function(json){
+                        CoursecommunityList = '<option value="">'+App.languageDict.attributes.All+'</option>';
+                        CoursecommunityList += '<option value="'+App.configuration.get('code')+'">'+App.configuration.get('name')+'</option>';
+                        $.each(json.rows, function(rec, index) {
+                            CoursecommunityList += '<option value="'+this.value.Code+'">'+this.value.Name+'</option>';
+                        })
+                        CoursecommunityList = '<select id="CommunitySelect">'+CoursecommunityList+'</select>';
+                        $('.DropDownOptn').append(CoursecommunityList);
+                    }
+                });
+            }
+            $('#creditsMainTable').append(CoursecommunityList);
+            $('#CommunitySelect').change(function(){
+                var selectedvalue =  $('#CommunitySelect').val();
+                creditsView.addHeading();
+                var count=0;
+                var c1 = new App.Collections.membercourseprogresses();
+                c1.fetch({
+                    async:false,
+                    success: function (courseDocs) {
+                        if(courseDocs.length>0){
+                            var mem_list1=[]
+                            var course_list1=[]
+                            for(var i=0;i<courseDocs.length;i++) {
+                                if(courseDocs.models[i].id != '_design/bell') {
+                                    mem_list1.push({"courseId": courseDocs.models[i].attributes.courseId, "MemberId" : courseDocs.models[i].attributes.memberId})
+                                }
+                            }
+                            if(mem_list1.length > 0){
+                                for(var i = 0 ; i < mem_list1.length; i++){
+                                    creditsView.courseId= mem_list1[i].courseId;
+                                    creditsView.mem_list1 = mem_list1[i];
+                                }
+                                //console.log(creditsView.courseId)
+                                creditsView.randerTable(selectedvalue);
+                            }
+                        }
+                    }
+                });
+            });
             creditsView.addHeading();
             var count=0;
             var courses = new App.Collections.membercourseprogresses();
             courses.fetch({
                 async:false,
                 success: function (courseDocs) {
-                    console.log(courseDocs)
                     if(courseDocs.length>0){
                         var mem_list=[]
                         var course_list=[]
@@ -435,7 +481,6 @@ $(function() {
                                 mem_list.push({"courseId": courseDocs.models[i].attributes.courseId, "MemberId" : courseDocs.models[i].attributes.memberId})
                             }
                         }
-                        console.log(mem_list)
                         if(mem_list.length > 0){
                             for(var i = 0 ; i < mem_list.length; i++){
                                 creditsView.courseId= mem_list[i].courseId;
diff --git a/app/MyApp/app/views/CreditsLeaderView.js b/app/MyApp/app/views/CreditsLeaderView.js
index 446fedc73..e7ea58d60 100644
--- a/app/MyApp/app/views/CreditsLeaderView.js
+++ b/app/MyApp/app/views/CreditsLeaderView.js
@@ -30,7 +30,6 @@ $(function () {
                 member.fetch({
                     async: false
                 })
-                console.log(member)
                 var MemberCourseProgress = new App.Collections.membercourseprogresses();
                 var stepsStatuses; var indexOfStepId = []; var stepIds = [];
                 var memberName = member.get('firstName') + " " + member.get('lastName')
@@ -58,7 +57,9 @@ $(function () {
                                         "memberId": ""
                                     };
                                     jsonObj.courseModel = courseModel;
+
                                     jsonObj.memberName = memberName;
+
                                     jsonObj.stepNo = indexOfStepId[j] + 1;
                                     jsonObj.attemptNo = stepsAttempt[indexOfStepId[j]];
                                     jsonObj.stepId = progressDoc.models[0].get('stepsIds')[indexOfStepId[j]];
@@ -72,12 +73,84 @@ $(function () {
                     async: false
                 });
             }
+            
+            var sortedData = unsortedData.sort(sortByProperty('memberName'));
+            for (var i = 0; i < sortedData.length > 0; i++) {
+                that.add(sortedData[i]);
+            }
+        },
+        randerTable: function (selectedvalue) {
+            if(selectedvalue == "" || selectedvalue == undefined){
+                this.render()
+            }
+            var that = this;
+            var unsortedData = []; var jsonArr = [];
+            for (var m = 0; m < that.mem_list.length; m++) {
+                 var courseModel = new App.Models.Course({
+                    _id: that.mem_list[m].courseId
+                })
+                courseModel.fetch({
+                    async: false
+                });
+                var memberId = that.mem_list[m].MemberId;
+                var member = new App.Models.Member({
+                    "_id": memberId
+                })
+                member.fetch({
+                    async: false
+                })
+                var firstName,lastName;
+                if(member.attributes.community == selectedvalue){
+                    firstName = member.attributes.firstName
+                    lastName = member.attributes.lastName
+                    var MemberCourseProgress = new App.Collections.membercourseprogresses();
+                    var stepsStatuses; var indexOfStepId = []; var stepIds = [];
+                    var memberName = firstName + " " + lastName
+                    MemberCourseProgress.courseId = that.courseId;
+                    MemberCourseProgress.memberId = memberId;
+                    MemberCourseProgress.fetch({
+                        success: function (progressDoc) {
+                            if (progressDoc.models.length > 0) {
+                                stepsStatuses = progressDoc.models[0].get('stepsStatus');
+                                stepsAttempt = progressDoc.models[0].get('pqAttempts');
+                                if (progressDoc.models[0].get('stepsIds').length > 0) {
+                                    for (var m = 0; m < stepsStatuses.length; m++) {
+                                        if ((stepsStatuses[m] instanceof Array) && (stepsStatuses[m][stepsAttempt[m]] != 'undefined') && (stepsStatuses[m][stepsAttempt[m]] == null)) {
+                                            indexOfStepId.push(m);
+                                        }
+                                    }
+                                    for (var j = 0; j < indexOfStepId.length; j++) {
+                                        var jsonObj = {
+                                            "courseModel": "",
+                                            "memberName": "",
+                                            "subDate": "",
+                                            "stepNo": "",
+                                            "attemptNo": "",
+                                            "stepId": "",
+                                            "memberId": ""
+                                        };
+                                        jsonObj.courseModel = courseModel;
+                                        jsonObj.memberName = memberName;
+                                        jsonObj.stepNo = indexOfStepId[j] + 1;
+                                        jsonObj.attemptNo = stepsAttempt[indexOfStepId[j]];
+                                        jsonObj.stepId = progressDoc.models[0].get('stepsIds')[indexOfStepId[j]];
+                                        jsonObj.memberId = memberId;
+                                        stepIds.push(jsonObj.stepId)
+                                        unsortedData.push(jsonObj);
+                                    }
+                                }
+                            }
+                        },
+                        async: false
+                    });
+                }
+            }
             var sortedData = unsortedData.sort(sortByProperty('memberName'));
-            console.log(sortedData);
             for (var i = 0; i < sortedData.length > 0; i++) {
                 that.add(sortedData[i]);
             }
         },
+
         addHeading: function() {
             this.$el.html('<tr><th>' + 'Learner' + '</th><th>' + 'Course' + '</th><th>' + 'Step No' + '</th><th>' + 'Action' + '</th></tr>');
         }

From 6ab0e1c8de8d41d94c7cc1c1de1b77d9b546712a Mon Sep 17 00:00:00 2001
From: Raju Chaudhary <razu_latakta@hotmail.com>
Date: Mon, 14 Aug 2017 16:46:54 +0545
Subject: [PATCH 4/4] [981] style adeded for select filter

---
 app/MyApp/app/Home-Urdu.css | 5 +++++
 app/MyApp/app/Home.css      | 7 ++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/app/MyApp/app/Home-Urdu.css b/app/MyApp/app/Home-Urdu.css
index 381c46631..8b38e8d0f 100644
--- a/app/MyApp/app/Home-Urdu.css
+++ b/app/MyApp/app/Home-Urdu.css
@@ -1252,3 +1252,8 @@ form > fieldset > ul > li.bbf-field.field-selectLanguage {
 #addIndividualResource{
     width:110px;
 }
+#CommunitySelect{
+    float: left;
+    margin-top: -45px;
+    margin-right: 15px;
+}
diff --git a/app/MyApp/app/Home.css b/app/MyApp/app/Home.css
index 385c154ab..b85164774 100644
--- a/app/MyApp/app/Home.css
+++ b/app/MyApp/app/Home.css
@@ -1059,4 +1059,9 @@ form > fieldset > ul > li.bbf-field.field-selectLanguage {
 .courseInfo{
     width:97%;
     margin-left:20px;
-}
\ No newline at end of file
+}
+#CommunitySelect{
+    float: right;
+    margin-top: -45px;
+    margin-right: 15px;
+}