Commit 2c476c7562af59c64cec40772039291f728aa32f
1 parent
3cab9e8a39
Exists in
master
added new code
Showing
4 changed files
with
269 additions
and
312 deletions
Show diff stats
app/partials/ContactView/ContactView.controller.js
| ... | ... | @@ -3,13 +3,45 @@ |
| 3 | 3 | //Load controller |
| 4 | 4 | angular.module('acufuel') |
| 5 | 5 | |
| 6 | - .controller('ContactViewController', ['$scope',function($scope) { | |
| 7 | - | |
| 8 | - $scope.test = "Testing..."; | |
| 9 | - | |
| 10 | - $(function() { | |
| 11 | - $('#toggle-one12').bootstrapToggle(); | |
| 12 | - $('#toggle-two21').bootstrapToggle(); | |
| 6 | + .controller('ContactViewController', ['$scope', '$uibModal', 'ContactViewService', 'ViewCompanyService', function($scope, $uibModal, ContactViewService, ViewCompanyService) { | |
| 7 | + $(function() { | |
| 8 | + $('#toggle-one12').bootstrapToggle(); | |
| 9 | + $('#toggle-two21').bootstrapToggle(); | |
| 13 | 10 | }) |
| 11 | + | |
| 12 | + $(document).ready(function() { | |
| 13 | + $('#contacts').DataTable(); | |
| 14 | + }); | |
| 15 | + | |
| 16 | + ContactViewService.getContacts().then(function(result) { | |
| 17 | + console.log('==========',result); | |
| 18 | + $scope.contactList = result; | |
| 19 | + | |
| 20 | + }) | |
| 21 | + | |
| 22 | + ContactViewService.getCompanies().then(function(result) { | |
| 23 | + console.log('==========',result); | |
| 24 | + $scope.companies = result; | |
| 25 | + | |
| 26 | + }) | |
| 27 | + | |
| 28 | + $scope.contactData = {}; | |
| 29 | + $scope.contactData.contactList = []; | |
| 30 | + $scope.addContact = function(){ | |
| 31 | + console.log('==== $scope.data======', $scope.data); | |
| 32 | + $scope.contactData.contactList.push($scope.data); | |
| 33 | + ViewCompanyService.addContact($scope.contactData).then(function(result) { | |
| 34 | + if(result.success){ | |
| 35 | + toastr.success(''+result.success+'', { | |
| 36 | + closeButton: true | |
| 37 | + }) | |
| 38 | + $('#contact-modal-3').modal('hide'); | |
| 39 | + }else{ | |
| 40 | + toastr.error(''+result.statusText+'', { | |
| 41 | + closeButton: true | |
| 42 | + }) | |
| 43 | + } | |
| 44 | + }) | |
| 45 | + } | |
| 14 | 46 | |
| 15 | 47 | }]); |
| 16 | 48 | \ No newline at end of file | ... | ... |
app/partials/ContactView/ContactView.html
| ... | ... | @@ -28,7 +28,7 @@ |
| 28 | 28 | </li> |
| 29 | 29 | <li style="margin: 0px 10px 4px 40px;"><input type="text" style="height:31px;"class="form-control" name="name" id="name" placeholder="Search In Table"></li> |
| 30 | 30 | <li><button type="button" class="btn btn-default btn-sm">Clear Search And Filters</button></li> |
| 31 | - <li style="float:right"><button type="submit" class="btn btn-success btn-sm"><i class="fa fa-plus" aria-hidden="true"></i> Add Company</button></li> | |
| 31 | + <li style="float: right"> <button type="submit" data-toggle="modal" data-target="#contact-modal-3" class="btn btn-success btn-sm"> <i class="fa fa-plus" aria-hidden="true"></i> Add Contact </button></li> | |
| 32 | 32 | </ul> |
| 33 | 33 | <br> |
| 34 | 34 | <div class="tab-content customer-table" style="margin:0px"> |
| ... | ... | @@ -38,75 +38,47 @@ |
| 38 | 38 | <tr> |
| 39 | 39 | <th> |
| 40 | 40 | <input type="text" class="form-control" style="height:31px;" name="name" id="name"> |
| 41 | - <label class="font-company">Last Name <i class="fa fa-sort" aria-hidden="true"></i></label> | |
| 42 | - </th> | |
| 43 | - <th> | |
| 44 | - <input type="text" class="form-control" style="height:31px;" name="name" id="name"> | |
| 45 | - <label class="font-company">First Name <i class="fa fa-sort" aria-hidden="true"></i></label> | |
| 46 | - </th> | |
| 47 | - <th> | |
| 48 | - <input type="text" class="form-control" style="height:31px;" name="name" id="name"> | |
| 49 | 41 | <label class="font-company">Company Name <i class="fa fa-sort" aria-hidden="true"></i></label> |
| 50 | 42 | </th> |
| 43 | + | |
| 51 | 44 | <th> |
| 52 | 45 | <input type="text" class="form-control" style="height:31px;" name="name" id="name"> |
| 53 | - <label class="font-company">Work Phone <i class="fa fa-sort" aria-hidden="true"></i></label> | |
| 46 | + <label class="font-company">Main Phone <i class="fa fa-sort" aria-hidden="true"></i></label> | |
| 54 | 47 | </th> |
| 55 | 48 | <th> |
| 56 | 49 | <input type="text" class="form-control" style="height:31px;" name="name" id="name"> |
| 57 | - <label class="font-company">Mobile Phone <i class="fa fa-sort" aria-hidden="true"></i></label> | |
| 50 | + <label class="font-company">Primary Contact <i class="fa fa-sort" aria-hidden="true"></i></label> | |
| 58 | 51 | </th> |
| 52 | + | |
| 59 | 53 | <th> |
| 60 | 54 | <input type="text" class="form-control" style="height:31px;" name="name" id="name"> |
| 61 | - <label class="font-company"> Title <i class="fa fa-sort" aria-hidden="true"></i></label> | |
| 62 | - </th> | |
| 55 | + <label class="font-company">Status <i class="fa fa-sort" aria-hidden="true"></i></label> | |
| 63 | 56 | <th> |
| 64 | 57 | <input type="text" class="form-control" style="height:31px;" name="name" id="name"> |
| 65 | - <label class="font-company">Username <i class="fa fa-sort" aria-hidden="true"></i></label> | |
| 58 | + <label class="font-company">Source <i class="fa fa-sort" aria-hidden="true"></i></label> | |
| 66 | 59 | </th> |
| 67 | 60 | <th> |
| 68 | - | |
| 69 | - <label class="font-company">Pricing Email <i class="fa fa-sort" aria-hidden="true"></i></label> | |
| 61 | + <input type="text" class="form-control" style="height:31px;" name="name" id="name"> | |
| 62 | + <label class="font-company">Margin Setting <i class="fa fa-sort" aria-hidden="true"></i></label> | |
| 70 | 63 | </th> |
| 71 | 64 | <th> |
| 72 | 65 | <input type="text" class="form-control" style="height:31px;" name="name" id="name"> |
| 73 | - <label class="font-company">Password <i class="fa fa-sort" aria-hidden="true"></i></label> | |
| 66 | + <label class="font-company">All In <i class="fa fa-sort" aria-hidden="true"></i></label> | |
| 74 | 67 | </th> |
| 75 | - <!-- <th></th> | |
| 76 | - <th></th> --> | |
| 77 | 68 | </tr> |
| 78 | 69 | </thead> |
| 79 | 70 | <tbody> |
| 80 | - <tr> | |
| 81 | - <td class="font-company">colony</td> | |
| 82 | - <td class="font-company">Gerry</td> | |
| 83 | - <td class="font-company">Est LLC</td> | |
| 84 | - <td class="font-company">(310) 555-1212</td> | |
| 85 | - <td class="font-company">(310) 555-1212</td> | |
| 86 | - <td class="font-company">Acufuel</td> | |
| 87 | - <td class="font-company">Usel 1</td> | |
| 88 | - <td class="font-company"><input id="toggle-one12" checked type="checkbox" data-size="mini" data-toggle="toggle"> | |
| 89 | - </td> | |
| 90 | - <td class="font-company">Password 123</td> | |
| 91 | - <!-- <td ></td> | |
| 92 | - <td></td> --> | |
| 93 | - </tr> | |
| 94 | - <tr> | |
| 95 | - <td class="font-company">colony</td> | |
| 96 | - <td class="font-company">Gerry</td> | |
| 97 | - <td class="font-company">Est LLC</td> | |
| 98 | - <td class="font-company">(310) 555-1212</td> | |
| 99 | - <td class="font-company">(310) 555-1212</td> | |
| 100 | - <td class="font-company">Acufuel</td> | |
| 101 | - <td class="font-company">Usel 1</td> | |
| 102 | - <td class="font-company"><input id="toggle-two21" checked type="checkbox" data-size="mini" data-toggle="toggle"> | |
| 103 | - | |
| 104 | - </td> | |
| 105 | - <td class="font-company">Password 123</td> | |
| 106 | - <!-- <td></td> | |
| 107 | - <td></td> --> | |
| 108 | - </tr> | |
| 109 | - </tbody> | |
| 71 | + <tr ng-repeat="contact in contactList"> | |
| 72 | + <td>{{contact.lastName}}</td> | |
| 73 | + <td>{{contact.firstName}}</td> | |
| 74 | + <td>{{contact.owner.companyName}}</td> | |
| 75 | + <td>{{contact.workPhone}}</td> | |
| 76 | + <td>{{contact.mobilePhone}}</td> | |
| 77 | + <td>{{contact.title}}</td> | |
| 78 | + <td>{{contact.username}}</td> | |
| 79 | + <td>{{contact.priceEmail}}</td> | |
| 80 | + </tr> | |
| 81 | + </tbody> | |
| 110 | 82 | </table> |
| 111 | 83 | <div class="row" style="margin-left: 0px;"> |
| 112 | 84 | <div class="col-md-2"> |
| ... | ... | @@ -138,95 +110,6 @@ |
| 138 | 110 | </div> |
| 139 | 111 | </div> |
| 140 | 112 | </div> |
| 141 | - <div class="tab-pane" id="contactView"> | |
| 142 | - <table class="table table-striped"> | |
| 143 | - <thead> | |
| 144 | - <tr> | |
| 145 | - <th> <input type="text" class="form-control" style="height:31px;" name="name" id="name"> Last Name</th> | |
| 146 | - <th> <input type="text" class="form-control" style="height:31px;" name="name" id="name">First Name</th> | |
| 147 | - <th> <input type="text" class="form-control" style="height:31px;" name="name" id="name">Company Name</th> | |
| 148 | - <th> <input type="text" class="form-control" style="height:31px;" name="name" id="name">Work Phone</th> | |
| 149 | - <th> <input type="text" class="form-control" style="height:31px;" name="name" id="name">Mobile Phone</th> | |
| 150 | - <th> <input type="text" class="form-control" style="height:31px;" name="name" id="name">Title</th> | |
| 151 | - <th> <input type="text" class="form-control" style="height:31px;" name="name" id="name">Pricing Email</th> | |
| 152 | - <th> <input type="text" class="form-control" style="height:31px;" name="name" id="name">Username</th> | |
| 153 | - <th> <input type="text" class="form-control" style="height:31px;" name="name" id="name">Password</th> | |
| 154 | - <th></th> | |
| 155 | - <th></th> | |
| 156 | - </tr> | |
| 157 | - </thead> | |
| 158 | - <tbody> | |
| 159 | - <tr> | |
| 160 | - <td>Name and inc.</td> | |
| 161 | - <td>3</td> | |
| 162 | - <td>03423233</td> | |
| 163 | - <td>Jemmy</td> | |
| 164 | - <td>KIAD</td> | |
| 165 | - <td></td> | |
| 166 | - <td><input id="toggle-one12" checked type="checkbox" data-size="mini" data-toggle="toggle"></td> <td></td> | |
| 167 | - <td>$123</td> | |
| 168 | - <td></td> | |
| 169 | - <td></td> | |
| 170 | - </tr> | |
| 171 | - <tr> | |
| 172 | - <td>Name and inc.</td> | |
| 173 | - <td>3</td> | |
| 174 | - <td>03423233</td> | |
| 175 | - <td>Jemmy</td> | |
| 176 | - <td>KIAD</td> | |
| 177 | - <td></td> | |
| 178 | - <td><input id="toggle-two21" checked type="checkbox" data-size="mini" data-toggle="toggle"></td> | |
| 179 | - <td></td> | |
| 180 | - <td>$123</td> | |
| 181 | - <td></td> | |
| 182 | - <td></td> | |
| 183 | - </tr> | |
| 184 | - </tbody> | |
| 185 | - </table> | |
| 186 | - <div class="row" style="margin-left: 0px;"> | |
| 187 | - <div class="col-md-2"> | |
| 188 | - <button type="button" class="btn btn-info">Export CSV</button> | |
| 189 | - | |
| 190 | - </div> | |
| 191 | - <div class="col-md-10"> | |
| 192 | - <div class="row" style="margin-left: 0px;"> | |
| 193 | - <div class="col-md-6"> | |
| 194 | - </div> | |
| 195 | - <div class="col-md-2"> | |
| 196 | - <select class="form-control"> | |
| 197 | - <option>20 Records Per Page</option> | |
| 198 | - <option>50 Records Per Page</option> | |
| 199 | - <option>100 Records Per Page</option> | |
| 200 | - </select> | |
| 201 | - </div> | |
| 202 | - <div class="col-md-4"> | |
| 203 | - <ul class="pagination" style="margin:0px"> | |
| 204 | - <li><a href="javascript:;">«</a></li> | |
| 205 | - <li class="active"><a href="#">1</a></li> | |
| 206 | - <li><a href="javascript:;">2</a></li> | |
| 207 | - <li><a href="javascript:;">3</a></li> | |
| 208 | - <li><a href="javascript:;">4</a></li> | |
| 209 | - <li><a href="javascript:;">5</a></li> | |
| 210 | - <li><a href="javascript:;">»</a></li> | |
| 211 | - </ul> | |
| 212 | - </div> | |
| 213 | - </div> | |
| 214 | - </div> | |
| 215 | - </div> | |
| 216 | - </div> | |
| 217 | - <div class="tab-pane" id="fuelVendors"> | |
| 218 | - <table class="table table-striped table-bordered"> | |
| 219 | - <thead> | |
| 220 | - <tr> | |
| 221 | - <th>Engine</th> | |
| 222 | - <th>Browser</th> | |
| 223 | - <th class="td-actions"></th> | |
| 224 | - </tr> | |
| 225 | - </thead> | |
| 226 | - <tbody> | |
| 227 | - </tbody> | |
| 228 | - </table> | |
| 229 | - </div> | |
| 230 | 113 | </div> |
| 231 | 114 | </div> |
| 232 | 115 | </div> |
| ... | ... | @@ -240,4 +123,178 @@ |
| 240 | 123 | </div> |
| 241 | 124 | <!-- /container --> |
| 242 | 125 | </div> |
| 243 | -<!-- /main --> | |
| 244 | 126 | \ No newline at end of file |
| 127 | +<!-- /main --> | |
| 128 | +<form class="modal multi-step" id="contact-modal-3" name="companyForm"> | |
| 129 | + <div class="modal-dialog modal-lg"> | |
| 130 | + <div class="modal-content"> | |
| 131 | + <div class="modal-body step-1" data-step="1" style="padding: 0;"> | |
| 132 | + <div> | |
| 133 | + <div class="row" style="margin: 0;"> | |
| 134 | + <div> | |
| 135 | + <div class="widget" style="margin-bottom: 0; box-shadow: none;"> | |
| 136 | + <div class="widget-header"> | |
| 137 | + <i class="icon-pencil"></i> | |
| 138 | + <i class="fa fa-tasks" aria-hidden="true"></i> | |
| 139 | + <h3>Add a New Contact</h3> | |
| 140 | + <div class="clearfix"></div> | |
| 141 | + </div> | |
| 142 | + <div class="widget-content" style="padding-left: 0; padding-right: 0; border-bottom: 0;"> | |
| 143 | + <div class="col-xs-12"> | |
| 144 | + <div class="col-md-6"> | |
| 145 | + <div class="pull-left" style="width: 110px;"> | |
| 146 | + <label class="new-input-label"><b>First Name</b></label> | |
| 147 | + </div> | |
| 148 | + <div class="pull-left" style="margin-left: 15px;"> | |
| 149 | + <input type="tel" ng-model="data.firstName" class="form-control" placeholder=""> | |
| 150 | + </div> | |
| 151 | + <div class="clearfix"></div> | |
| 152 | + </div> | |
| 153 | + <div class="col-md-6"> | |
| 154 | + | |
| 155 | + <div class="pull-left" style="width: 110px;"> | |
| 156 | + <label class="new-input-label"><b>Last Name</b></label> | |
| 157 | + </div> | |
| 158 | + <div class="pull-left" style="margin-left: 15px;"> | |
| 159 | + <input type="tel" ng-model="data.lastName" class="form-control" id="Address" placeholder=""> | |
| 160 | + </div> | |
| 161 | + <div class="clearfix"></div> | |
| 162 | + </div> | |
| 163 | + </div> | |
| 164 | + <div class="clearfix"></div><br> | |
| 165 | + <div class="col-xs-12"> | |
| 166 | + <div class="col-md-6"> | |
| 167 | + <div class="pull-left" style="width: 110px;"> | |
| 168 | + <label class="new-input-label"><b>Title</b></label> | |
| 169 | + </div> | |
| 170 | + <div class="pull-left" style="margin-left: 15px;"> | |
| 171 | + <input type="tel" ng-model="data.title" class="form-control" id="Address" placeholder=""> | |
| 172 | + </div> | |
| 173 | + <div class="clearfix"></div> | |
| 174 | + </div> | |
| 175 | + <div class="col-md-6"> | |
| 176 | + | |
| 177 | + <div class="pull-left" style="width: 110px;"> | |
| 178 | + <label class="new-input-label"><b>Email</b></label> | |
| 179 | + </div> | |
| 180 | + <div class="pull-left" style="margin-left: 15px;"> | |
| 181 | + <input type="email" ng-model="data.email" class="form-control" id="Address" placeholder=""> | |
| 182 | + </div> | |
| 183 | + <div class="clearfix"></div> | |
| 184 | + </div> | |
| 185 | + </div> | |
| 186 | + <div class="clearfix"></div><br> | |
| 187 | + <div class="col-xs-12"> | |
| 188 | + <div class="col-md-6"> | |
| 189 | + <div class="pull-left" style="width: 110px;"> | |
| 190 | + <label class="new-input-label"><b>Username</b></label> | |
| 191 | + </div> | |
| 192 | + <div class="pull-left" style="margin-left: 15px;"> | |
| 193 | + <input type="tel" ng-model="data.userName" class="form-control" id="Address" placeholder=""> | |
| 194 | + </div> | |
| 195 | + <div class="clearfix"></div> | |
| 196 | + </div> | |
| 197 | + <div class="col-md-6"> | |
| 198 | + | |
| 199 | + <div class="pull-left" style="width: 110px;"> | |
| 200 | + <label class="new-input-label"><b>Password</b></label> | |
| 201 | + </div> | |
| 202 | + <div class="pull-left" style="margin-left: 15px;"> | |
| 203 | + <input type="password" ng-model="data.password" class="form-control" id="Address" placeholder=""> | |
| 204 | + </div> | |
| 205 | + <div class="clearfix"></div> | |
| 206 | + </div> | |
| 207 | + </div> | |
| 208 | + <div class="clearfix"></div><br> | |
| 209 | + <div class="col-xs-12"> | |
| 210 | + <div class="col-md-6"> | |
| 211 | + <div class="pull-left" style="width: 110px;"> | |
| 212 | + <label class="new-input-label"><b>Work Phone</b></label> | |
| 213 | + </div> | |
| 214 | + <div class="pull-left" style="margin-left: 15px;"> | |
| 215 | + <input type="tel" ng-model="data.workPhone" class="form-control" id="Address" placeholder=""> | |
| 216 | + </div> | |
| 217 | + <div class="clearfix"></div> | |
| 218 | + </div> | |
| 219 | + <div class="col-md-6"> | |
| 220 | + | |
| 221 | + <div class="pull-left" style="width: 110px;"> | |
| 222 | + <label class="new-input-label"><b>Mobile Phone</b></label> | |
| 223 | + </div> | |
| 224 | + <div class="pull-left" style="margin-left: 15px;"> | |
| 225 | + <input type="tel" ng-model="data.mobilePhone" class="form-control" id="Address" placeholder=""> | |
| 226 | + </div> | |
| 227 | + <div class="clearfix"></div> | |
| 228 | + </div> | |
| 229 | + </div> | |
| 230 | + <div class="clearfix"></div><br> | |
| 231 | + <div class="col-xs-12"> | |
| 232 | + <div class="col-md-12"> | |
| 233 | + <div class="pull-left" style="width: 110px;"> | |
| 234 | + <label class="new-input-label"><b>Address</b></label> | |
| 235 | + </div> | |
| 236 | + <div class="pull-right" style="width: calc(100% - 123px);"> | |
| 237 | + <input type="tel" class="form-control" ng-model="data.address" id="Address" placeholder=""> | |
| 238 | + </div> | |
| 239 | + <div class="clearfix"></div> | |
| 240 | + </div> | |
| 241 | + </div> | |
| 242 | + <div class="clearfix"></div><br> | |
| 243 | + <div class="col-xs-12"> | |
| 244 | + <div class="col-md-12"> | |
| 245 | + <div class="pull-left" style="width: 110px;"> | |
| 246 | + <label class="new-input-label"><b>Company</b></label> | |
| 247 | + </div> | |
| 248 | + <div class="pull-right" style="width: calc(100% - 123px);"> | |
| 249 | + <select class="form-control" ng-model="data.companyId"> | |
| 250 | + <option value="{{company.id}}" ng-repeat="company in companies">{{company.companyName}}</option> | |
| 251 | + </select> | |
| 252 | + </div> | |
| 253 | + <div class="clearfix"></div> | |
| 254 | + </div> | |
| 255 | + </div> | |
| 256 | + | |
| 257 | + | |
| 258 | + <div class="clearfix"></div> | |
| 259 | + <br/> | |
| 260 | + <div class="col-xs-12"> | |
| 261 | + <div class="col-md-3"> | |
| 262 | + <div class="pull-left my-toggle-switch"> | |
| 263 | + <div style="color: #ff9a01;">Price Email     | |
| 264 | + <input id="price-one2" checked type="checkbox" data-size="mini" data-width="55" data-toggle="toggle" data-on="On" data-off="Off"> | |
| 265 | + </div> | |
| 266 | + </div> | |
| 267 | + <div class="clearfix"></div> | |
| 268 | + </div> | |
| 269 | + <div class="col-md-3"> | |
| 270 | + <div class="pull-left my-toggle-switch"> | |
| 271 | + <div style="color: #ff9a01;">Primary Contact     | |
| 272 | + <input type="checkbox" ng-model="data.primaryContact"> | |
| 273 | + </div> | |
| 274 | + </div> | |
| 275 | + <div class="clearfix"></div> | |
| 276 | + </div> | |
| 277 | + <div class="col-md-6"> | |
| 278 | + <div class="pull-left" style="width: 110px;"> | |
| 279 | + <label class="new-input-label"><b>Internal Note</b></label> | |
| 280 | + </div> | |
| 281 | + <div class="pull-left" style="width: calc(100% - 110px);"> | |
| 282 | + <textarea name="message" ng-model="data.note" rows="4" cols="34"></textarea> | |
| 283 | + </div> | |
| 284 | + </div> | |
| 285 | + <div class="clearfix"></div> | |
| 286 | + </div> | |
| 287 | + <div class="clearfix"></div><br> | |
| 288 | + </div> | |
| 289 | + </div> | |
| 290 | + <div class="clearfix"></div> | |
| 291 | + </div> | |
| 292 | + </div> | |
| 293 | + </div> | |
| 294 | + </div> | |
| 295 | + <div class="modal-footer" style="border-top: 0;"> | |
| 296 | + <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button> | |
| 297 | + <button type="button" class="btn btn-primary step step-1" data-step="1" ng-click="addContact()">Save</button> | |
| 298 | + </div> | |
| 299 | + </div> | |
| 300 | + </div> | |
| 301 | +</form> | |
| 245 | 302 | \ No newline at end of file | ... | ... |
app/partials/ContactView/ContactView.service.js
| 1 | 1 | (function(){ |
| 2 | 2 | 'use strict'; |
| 3 | 3 | angular.module('acufuel') |
| 4 | - .service('ContactViewService', ['$q', '$http', 'BE', ContactViewService]); | |
| 4 | + .service('ContactViewService', ['$q', '$http', 'BASE_URL', ContactViewService]); | |
| 5 | 5 | |
| 6 | - function ContactViewService($q, $http, BE) { | |
| 6 | + function ContactViewService($q, $http, BASE_URL) { | |
| 7 | 7 | var temp = {}; |
| 8 | 8 | |
| 9 | + this.getContacts = function() { | |
| 10 | + | |
| 11 | + var deferred = $q.defer(); | |
| 12 | + $http({ | |
| 13 | + method : 'GET', | |
| 14 | + url : BASE_URL.url +'/user/allContacts', | |
| 15 | + headers : {'Content-Type': 'application/json'}, | |
| 16 | + }) | |
| 17 | + .then(function (result){ | |
| 18 | + deferred.resolve(result.data); | |
| 19 | + },function (result){ | |
| 20 | + deferred.resolve(result.data); | |
| 21 | + }) | |
| 22 | + return deferred.promise; | |
| 23 | + } | |
| 9 | 24 | |
| 10 | - | |
| 25 | + this.getCompanies = function() { | |
| 26 | + | |
| 27 | + var deferred = $q.defer(); | |
| 28 | + $http({ | |
| 29 | + method : 'GET', | |
| 30 | + url : BASE_URL.url +'/user/allCompanies', | |
| 31 | + headers : {'Content-Type': 'application/json'}, | |
| 32 | + }) | |
| 33 | + .then(function (result){ | |
| 34 | + deferred.resolve(result.data); | |
| 35 | + },function (result){ | |
| 36 | + deferred.resolve(result.data); | |
| 37 | + }) | |
| 38 | + return deferred.promise; | |
| 39 | + } | |
| 11 | 40 | } |
| 12 | 41 | |
| 13 | 42 | })(); |
| 14 | 43 | \ No newline at end of file | ... | ... |
app/partials/customers/customers.html
| ... | ... | @@ -2,73 +2,6 @@ |
| 2 | 2 | .subnavbar .mainnav > li:nth-child(3) > a{ |
| 3 | 3 | color: #ff9900; |
| 4 | 4 | } |
| 5 | - | |
| 6 | - .button1 { | |
| 7 | - display: inline-block; | |
| 8 | - height: 35px; | |
| 9 | - line-height: 35px; | |
| 10 | - padding-right: 15px; | |
| 11 | - padding-left: 50px; | |
| 12 | - position: relative; | |
| 13 | - background-color:rgb(41,127,184); | |
| 14 | - color:rgb(255,255,255); | |
| 15 | - text-decoration: none; | |
| 16 | - text-transform: uppercase; | |
| 17 | - letter-spacing: 1px; | |
| 18 | - margin-bottom: 15px; | |
| 19 | - border: 0; | |
| 20 | - | |
| 21 | - | |
| 22 | - border-radius: 5px; | |
| 23 | - -moz-border-radius: 5px; | |
| 24 | - -webkit-border-radius: 5px; | |
| 25 | - text-shadow:0px 1px 0px rgba(0,0,0,0.5); | |
| 26 | - -ms-filter:"progid:DXImageTransform.Microsoft.dropshadow(OffX=0,OffY=1,Color=#ff123852,Positive=true)";zoom:1; | |
| 27 | - filter:progid:DXImageTransform.Microsoft.dropshadow(OffX=0,OffY=1,Color=#ff123852,Positive=true); | |
| 28 | - | |
| 29 | - -moz-box-shadow:0px 2px 2px rgba(0,0,0,0.2); | |
| 30 | - -webkit-box-shadow:0px 2px 2px rgba(0,0,0,0.2); | |
| 31 | - box-shadow:0px 2px 2px rgba(0,0,0,0.2); | |
| 32 | - -ms-filter:"progid:DXImageTransform.Microsoft.dropshadow(OffX=0,OffY=2,Color=#33000000,Positive=true)"; | |
| 33 | - filter:progid:DXImageTransform.Microsoft.dropshadow(OffX=0,OffY=2,Color=#33000000,Positive=true); | |
| 34 | - } | |
| 35 | - | |
| 36 | - .button1 span { | |
| 37 | - position: absolute; | |
| 38 | - left: 0; | |
| 39 | - top: 0; | |
| 40 | - width: 35px; | |
| 41 | - background-color:rgba(0,0,0,0.5); | |
| 42 | - | |
| 43 | - -webkit-border-top-left-radius: 5px; | |
| 44 | - -webkit-border-bottom-left-radius: 5px; | |
| 45 | - -moz-border-radius-topleft: 5px; | |
| 46 | - -moz-border-radius-bottomleft: 5px; | |
| 47 | - border-top-left-radius: 5px; | |
| 48 | - border-bottom-left-radius: 5px; | |
| 49 | - border-right: 1px solid rgba(0,0,0,0.15); | |
| 50 | - } | |
| 51 | - | |
| 52 | - .button1:hover span, .button1.active span { | |
| 53 | - background-color:rgb(0,102,26); | |
| 54 | - border-right: 1px solid rgba(0,0,0,0.3); | |
| 55 | - } | |
| 56 | - | |
| 57 | - .button1:active { | |
| 58 | - margin-top: 2px; | |
| 59 | - margin-bottom: 13px; | |
| 60 | - | |
| 61 | - -moz-box-shadow:0px 1px 0px rgba(255,255,255,0.5); | |
| 62 | - -webkit-box-shadow:0px 1px 0px rgba(255,255,255,0.5); | |
| 63 | - box-shadow:0px 1px 0px rgba(255,255,255,0.5); | |
| 64 | - -ms-filter:"progid:DXImageTransform.Microsoft.dropshadow(OffX=0,OffY=1,Color=#ccffffff,Positive=true)"; | |
| 65 | - filter:progid:DXImageTransform.Microsoft.dropshadow(OffX=0,OffY=1,Color=#ccffffff,Positive=true); | |
| 66 | - } | |
| 67 | - | |
| 68 | - .button1.turquoise { | |
| 69 | - background: #449d44; | |
| 70 | - } | |
| 71 | - | |
| 72 | 5 | </style> |
| 73 | 6 | <div class="main"> |
| 74 | 7 | <div class="container"> |
| ... | ... | @@ -100,7 +33,7 @@ |
| 100 | 33 | <br> |
| 101 | 34 | <div class="tab-content customer-table" style="margin:0px"> |
| 102 | 35 | <div class="tab-pane active" id="companyView"> |
| 103 | - <table id="example" class="table table-striped"> | |
| 36 | + <table class="table table-striped"> | |
| 104 | 37 | <thead> |
| 105 | 38 | <tr> |
| 106 | 39 | <th> |
| ... | ... | @@ -198,95 +131,6 @@ |
| 198 | 131 | </div> |
| 199 | 132 | </div> |
| 200 | 133 | </div> |
| 201 | - <div class="tab-pane" id="contactView"> | |
| 202 | - <table class="table table-striped"> | |
| 203 | - <thead> | |
| 204 | - <tr> | |
| 205 | - <th> <input type="text" class="form-control" style="height:31px;" name="name" id="name"> Last Name</th> | |
| 206 | - <th> <input type="text" class="form-control" style="height:31px;" name="name" id="name">First Name</th> | |
| 207 | - <th> <input type="text" class="form-control" style="height:31px;" name="name" id="name">Company Name</th> | |
| 208 | - <th> <input type="text" class="form-control" style="height:31px;" name="name" id="name">Work Phone</th> | |
| 209 | - <th> <input type="text" class="form-control" style="height:31px;" name="name" id="name">Mobile Phone</th> | |
| 210 | - <th> <input type="text" class="form-control" style="height:31px;" name="name" id="name">Title</th> | |
| 211 | - <th> <input type="text" class="form-control" style="height:31px;" name="name" id="name">Pricing Email</th> | |
| 212 | - <th> <input type="text" class="form-control" style="height:31px;" name="name" id="name">Username</th> | |
| 213 | - <th> <input type="text" class="form-control" style="height:31px;" name="name" id="name">Password</th> | |
| 214 | - <th></th> | |
| 215 | - <th></th> | |
| 216 | - </tr> | |
| 217 | - </thead> | |
| 218 | - <tbody> | |
| 219 | - <tr> | |
| 220 | - <td>Name and inc.</td> | |
| 221 | - <td>3</td> | |
| 222 | - <td>03423233</td> | |
| 223 | - <td>Jemmy</td> | |
| 224 | - <td>KIAD</td> | |
| 225 | - <td></td> | |
| 226 | - <td><input type="checkbox" data-toggle="toggle" data-size="mini"></td> | |
| 227 | - <td></td> | |
| 228 | - <td>$123</td> | |
| 229 | - <td></td> | |
| 230 | - <td></td> | |
| 231 | - </tr> | |
| 232 | - <tr> | |
| 233 | - <td>Name and inc.</td> | |
| 234 | - <td>3</td> | |
| 235 | - <td>03423233</td> | |
| 236 | - <td>Jemmy</td> | |
| 237 | - <td>KIAD</td> | |
| 238 | - <td></td> | |
| 239 | - <td><input type="checkbox" data-toggle="toggle" data-size="mini"></td> | |
| 240 | - <td></td> | |
| 241 | - <td>$123</td> | |
| 242 | - <td></td> | |
| 243 | - <td></td> | |
| 244 | - </tr> | |
| 245 | - </tbody> | |
| 246 | - </table> | |
| 247 | - <div class="row" style="margin-left: 0px;"> | |
| 248 | - <div class="col-md-2"> | |
| 249 | - <button type="button" class="btn btn-warning">Export Customers</button> | |
| 250 | - </div> | |
| 251 | - <div class="col-md-10"> | |
| 252 | - <div class="row" style="margin-left: 0px;"> | |
| 253 | - <div class="col-md-6"> | |
| 254 | - </div> | |
| 255 | - <div class="col-md-2"> | |
| 256 | - <select class="form-control"> | |
| 257 | - <option>20 Records Per Page</option> | |
| 258 | - <option>50 Records Per Page</option> | |
| 259 | - <option>100 Records Per Page</option> | |
| 260 | - </select> | |
| 261 | - </div> | |
| 262 | - <div class="col-md-4"> | |
| 263 | - <ul class="pagination" style="margin:0px"> | |
| 264 | - <li><a href="javascript:;">«</a></li> | |
| 265 | - <li class="active"><a href="#">1</a></li> | |
| 266 | - <li><a href="javascript:;">2</a></li> | |
| 267 | - <li><a href="javascript:;">3</a></li> | |
| 268 | - <li><a href="javascript:;">4</a></li> | |
| 269 | - <li><a href="javascript:;">5</a></li> | |
| 270 | - <li><a href="javascript:;">»</a></li> | |
| 271 | - </ul> | |
| 272 | - </div> | |
| 273 | - </div> | |
| 274 | - </div> | |
| 275 | - </div> | |
| 276 | - </div> | |
| 277 | - <div class="tab-pane" id="fuelVendors"> | |
| 278 | - <table class="table table-striped table-bordered"> | |
| 279 | - <thead> | |
| 280 | - <tr> | |
| 281 | - <th>Engine</th> | |
| 282 | - <th>Browser</th> | |
| 283 | - <th class="td-actions"></th> | |
| 284 | - </tr> | |
| 285 | - </thead> | |
| 286 | - <tbody> | |
| 287 | - </tbody> | |
| 288 | - </table> | |
| 289 | - </div> | |
| 290 | 134 | </div> |
| 291 | 135 | </div> |
| 292 | 136 | </div> |
| ... | ... | @@ -301,7 +145,6 @@ |
| 301 | 145 | <!-- /container --> |
| 302 | 146 | </div> |
| 303 | 147 | <!-- /main --> |
| 304 | - | |
| 305 | 148 | <form class="modal multi-step" id="demo-modal-3" name="companyForm"> |
| 306 | 149 | <div class="modal-dialog modal-lg"> |
| 307 | 150 | <div class="modal-content"> |
| ... | ... | @@ -625,8 +468,4 @@ |
| 625 | 468 | sendEvent = function(sel, step) { |
| 626 | 469 | $(sel).trigger('next.m.' + step); |
| 627 | 470 | } |
| 628 | -</script> | |
| 629 | - | |
| 630 | - | |
| 631 | - | |
| 632 | - | |
| 471 | +</script> | |
| 633 | 472 | \ No newline at end of file | ... | ... |