Commit 0c48d68b6905512203a5ee5720e6c04d697f3118
1 parent
5801d23b28
Exists in
master
and in
1 other branch
text xhange
Showing
3 changed files
with
48 additions
and
45 deletions
Show diff stats
pages/Home.html
... | ... | @@ -120,7 +120,7 @@ |
120 | 120 | <img class="card-img-top" src="images/Hyderabad.png"> |
121 | 121 | <img class="img-top " src="images/hyderabad_1.png" ng-click="watch('Hyderabad')"> |
122 | 122 | </div> |
123 | - <div class="txt">hyderabad</div> | |
123 | + <div class="txt">Hyderabad</div> | |
124 | 124 | <div class="txt1">IIT Hyderabad | September 14th, 2019</div> |
125 | 125 | </div> |
126 | 126 | <div class="col-md-4 col-sm-8 color" style="margin-top: 5%;"> | ... | ... |
pages/registration.html
... | ... | @@ -99,7 +99,10 @@ |
99 | 99 | </div> |
100 | 100 | <div class="form-group"> |
101 | 101 | <label>Attach Pitch Deck: *</label> |
102 | - <input type="file" class="form-control-file" file-model="base64textString" id="filePicker" accept=".png, .jpg, .jpeg, .pdf, .ppt" required/> | |
102 | + <input type="file" class="form-control-file" ng-model="data.uploadFile" id="filePicker" accept=".png, .jpg, .jpeg, .pdf, .ppt" ng-required="uploadFile"> | |
103 | + </div> | |
104 | + <div> | |
105 | + "Fields marked with "<b>*</b>" are mandatory." | |
103 | 106 | </div> |
104 | 107 | </div> |
105 | 108 | <!-- <div class="col-xs-12 col-md-6 input-wrapper" > | ... | ... |
script.js
... | ... | @@ -655,6 +655,7 @@ |
655 | 655 | var binaryString = readerEvt.target.result; |
656 | 656 | $scope.base64textString = btoa(binaryString); |
657 | 657 | console.log("base64textarea",$scope.base64textString) |
658 | + $scope.data.uploadFile = file.name; | |
658 | 659 | }; |
659 | 660 | |
660 | 661 | reader.readAsBinaryString(file); |
... | ... | @@ -674,41 +675,41 @@ |
674 | 675 | } |
675 | 676 | } |
676 | 677 | |
677 | - $rootScope.tokenCall = function(val) { | |
678 | - console.log('val-------->', val); | |
679 | - if (val == undefined) { | |
680 | - $('#invalidToken').css('display', 'block'); | |
681 | - } else { | |
682 | - val = val.toUpperCase(); | |
683 | - if((val == "IITH99" && $scope.data.city != "Hyderabad") || (val == "IITM99" && $scope.data.city != "Chennai") || (val == "IITD99" && $scope.data.city != "Delhi") || (val == "IITB99" && $scope.data.city != "Mumbai") || (val == "IITK99" && $scope.data.city != "Kanpur") || (val == "IIMC99" && $scope.data.city != "Kolkata") || (val == "IIMA99" && $scope.data.city != "Ahmedabad") || (val == "JAI40" && $scope.data.city != "Jaipur")){ | |
684 | - $scope.tokencheck = false; | |
685 | - return; | |
686 | - } | |
687 | - $http.get(BASE_URL + '/ambassadors?filter={"where": {"referalToken": "' + val + '"}}') | |
688 | - .then(function(searchResult) { | |
689 | - console.log("searchResult",searchResult) | |
690 | - if (searchResult.data.length == 0) { | |
691 | - $scope.tokencheck = false; | |
692 | - $scope.discountAmount = 0; | |
693 | - } else { | |
694 | - console.log("===searchResult.data[0].discount===",searchResult.data[0].discount); | |
695 | - $scope.discountpercentage = searchResult.data[0].discount; | |
696 | - console.log("===searchResultdiscountpercentage===",$scope.discountpercentage); | |
697 | - $scope.tokencheck = true; | |
698 | - } | |
699 | - },function(err){ | |
700 | - console.log(err) | |
701 | - }); | |
678 | + // $rootScope.tokenCall = function(val) { | |
679 | + // console.log('val-------->', val); | |
680 | + // if (val == undefined) { | |
681 | + // $('#invalidToken').css('display', 'block'); | |
682 | + // } else { | |
683 | + // val = val.toUpperCase(); | |
684 | + // if((val == "IITH99" && $scope.data.city != "Hyderabad") || (val == "IITM99" && $scope.data.city != "Chennai") || (val == "IITD99" && $scope.data.city != "Delhi") || (val == "IITB99" && $scope.data.city != "Mumbai") || (val == "IITK99" && $scope.data.city != "Kanpur") || (val == "IIMC99" && $scope.data.city != "Kolkata") || (val == "IIMA99" && $scope.data.city != "Ahmedabad") || (val == "JAI40" && $scope.data.city != "Jaipur")){ | |
685 | + // $scope.tokencheck = false; | |
686 | + // return; | |
687 | + // } | |
688 | + // $http.get(BASE_URL + '/ambassadors?filter={"where": {"referalToken": "' + val + '"}}') | |
689 | + // .then(function(searchResult) { | |
690 | + // console.log("searchResult",searchResult) | |
691 | + // if (searchResult.data.length == 0) { | |
692 | + // $scope.tokencheck = false; | |
693 | + // $scope.discountAmount = 0; | |
694 | + // } else { | |
695 | + // console.log("===searchResult.data[0].discount===",searchResult.data[0].discount); | |
696 | + // $scope.discountpercentage = searchResult.data[0].discount; | |
697 | + // console.log("===searchResultdiscountpercentage===",$scope.discountpercentage); | |
698 | + // $scope.tokencheck = true; | |
699 | + // } | |
700 | + // },function(err){ | |
701 | + // console.log(err) | |
702 | + // }); | |
702 | 703 | |
703 | - } | |
704 | - }; | |
704 | + // } | |
705 | + // }; | |
705 | 706 | |
706 | 707 | $scope.submit = function() { |
707 | - //$scope.data.uploadFile = $scope.base64textString; | |
708 | + | |
708 | 709 | $scope.ticketAmnt = 500; |
709 | - if($scope.tokencheck == false){ | |
710 | - $scope.data.referalToken = null; | |
711 | - } | |
710 | + // if($scope.tokencheck == false){ | |
711 | + // $scope.data.referalToken = null; | |
712 | + // } | |
712 | 713 | // if ($scope.data.name == undefined || $scope.data.email == undefined || $scope.data.number == undefined) { |
713 | 714 | // var x = document.getElementById("snackbar") |
714 | 715 | // setTimeout(function(){ x.className = x.className.replace("show", ""); }, 3000); |
... | ... | @@ -716,18 +717,17 @@ |
716 | 717 | $scope.infoForm = true; |
717 | 718 | $scope.detail = {}; |
718 | 719 | $scope.data.phone = "+91"+$scope.data.number; |
719 | - if($scope.data.referalToken == null){ | |
720 | - $scope.data.referalToken = "N.A." | |
721 | - } | |
722 | - var file =document.getElementById('filePicker').files[0]; | |
723 | - console.log("file",filePicker) | |
720 | + // if($scope.data.referalToken == null){ | |
721 | + // $scope.data.referalToken = "N.A." | |
722 | + // } | |
723 | + // var file =document.getElementById('filePicker').files[0]; | |
724 | + // console.log("file",filePicker) | |
724 | 725 | // var image = BASE_URL+'/containers/applicants/download/' |
725 | - // console.log("file",image) | |
726 | - // var imagePath = filePicker.name; | |
726 | + // var imagePath = file.name; | |
727 | 727 | // $scope.data.uploadFile = image + imagePath; |
728 | + // console.log($scope.data.uploadFile) | |
728 | 729 | // var fd = new FormData() |
729 | - // fd.append('filePicker',data); | |
730 | - | |
730 | + // fd.append('filePicker',$scope.data); | |
731 | 731 | // var deferred = $q.defer(); |
732 | 732 | // $http({ |
733 | 733 | // method:'POST', |
... | ... | @@ -738,8 +738,6 @@ |
738 | 738 | // }) |
739 | 739 | // .success(function(result){ |
740 | 740 | // deferred.resolve(result); |
741 | - // }) | |
742 | - | |
743 | 741 | $http({ |
744 | 742 | method: 'POST', |
745 | 743 | url: BASE_URL+'/applicants', |
... | ... | @@ -840,7 +838,9 @@ |
840 | 838 | |
841 | 839 | }, function myError(error) { |
842 | 840 | |
843 | - }); | |
841 | + }); | |
842 | + | |
843 | + // }) | |
844 | 844 | |
845 | 845 | //} |
846 | 846 | ... | ... |