viithiisys / Acufuel

Browse Code »

Commit 8f7dbe97c18e4c9337c65471520874a44d99f3c4

Authored by Swarn Singh 2017-06-08 07:41:36 -0400

1 parent 2263bfe7c9

Exists in master

fuel order complete, fixed bugs on ramp fee manager

Showing 17 changed files with 351 additions and 23 deletions Show diff stats

app/css/custom.css

Diff comments View file @8f7dbe9

 /*------------------------------------------------------------------
 [Custom Stylesheet]
 Last change:	03/25/2013
 Assigned to:	You
 -------------------------------------------------------------------*/
 body{
 	color: #333;
 }
 .custom-widget-content{
 	width: 100%;
 	height: auto;
 	padding: 15px 0;
 	background-color: #fff;
 	border: 1px solid #D5D5D5;
 	border-radius: 0 0 5px 5px;
 }
 .hr{
 	margin: 5px 0;
 }
 .disableSelect:disabled{
 	border: 0;
 	background-color: transparent;
 	color: #f90;
 	box-shadow: none;
 	-webkit-appearance: none;
     appearance: none;
 }
 .disableInput:disabled{
 	border: 0;
 	background-color: transparent;
 	color: #222;
 	box-shadow: none;
 }
 .img-logo{
 	height: 25px;
 	padding-left: 10%;
 }
 .widget-header > i{
 	display: inline-block;
     margin-top: -3px;
     margin-left: 13px;
     margin-right: -2px;
     font-size: 16px;
     color: #555;
     vertical-align: middle;
 }
 table{
 	width: 100%;
 }
 table th, td{
 	font-size: 13px;
 }
 .navbar-brand{
 	height: auto;
 }
 .custom-widget-content .btn-xs{
 	padding: 3px 5px;
 }
 .fc-event{
 	background-color: #ff9900 !important;
 	color: #fff !important;
 	border: 1px solid #ff9900 !important;
 }
 .pull-right-color{
 	background-image: linear-gradient(to bottom, #1c84c6  0%, #1c84c6  100%);
 }
 .pull-right-setup{
 	margin-bottom: 10px;
 	background-image: linear-gradient(to bottom, #1c84c6  0%, #1c84c6  100%);
 }
 .Airport{
 	padding-top: 5px;
 }
 .src-image{
 	width: 50px;
 	height: 50px;
 }
 .Accept{
 	padding-top: 25px;
 }
 .dis{
 	float: left;
 	margin-right:100px;
 }
 /*.email-password{
 	width: 40px;
 	height: 24px;
 }*/
 .email-password-icon{
 	width: 10px;
 	height: 10px;
 }
 @media( max-width: 768px;){
 .btn{
 font-size: 10px !important;
 }
 .dis{
 	float: none;
 	margin-right: 0px;
 }
 }
 .Search-tabs{
 	border-bottom: 0px solid #ddd; */
 }
 .customer-table table{
 	width: 100%;
 }
 .customer-table input{
 	border-radius: 0;
 	box-shadow: none;
 	border: 1px solid #e4e3e3;
 	padding: 0px;
 	font-size: 10px;
 	display: -webkit-inline-box;
 	display: inline-box;
 	height: 31px;
 }
 .customer-table select{
 	border-radius: 0;
 	box-shadow: none;
 	border: 1px solid #e4e3e3;
 	padding: 0px;
 	font-size: 10px;
 	height: 31px;
 	display: -webkit-inline-box;
 	display: inline-box;
 }
 .customer-table th > label{
 	font-weight: bold;
 	padding: 10px 5px 2px 5px;
 	margin-bottom: 0;
 }
 .customer-table td{
 	padding: 5px !important;
 	height: auto !important;
 	vertical-align: middle !important;
 }
 .customer-table td > select{
 	height: 22px !important;
 }
 .customer-table td > button{
 	font-size: 10px;
 }
 /*.new-input-label{
 	margin-bottom: 0;
 	line-height: 34px;
 }*/
 /*  new custom css for accrodian tabs */
 .customAccordianHeader{
 	width: 100%;
 	height: auto;
 	background-color: #F3F3F3;
 	border: 1px solid #ddd;
     color: #333;
     box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.35);
     border-radius: 3px 3px 3px 3px;
     padding: 10px 15px;
     margin-top: 10px;
 }
 .customAccordianHeader.customActive{
 	background-image: -webkit-gradient(linear, left 0%, left 100%, from(#555555), to(#3b3b3b));
 	background-image: linear-gradient(to bottom, #555555 0%, #3b3b3b 100%);
 	background-repeat: repeat-x;
 	border: 1px solid #222222;
     color: #FFF;
     border-radius: 3px 3px 0 0;
 }
 .customAccordianHeader > span{
 	font-size: 15px;
 	margin-right: 20px;
 	line-height: 22px;
 	float: left;
 }
 .customAccordianHeader .btn{
 	padding: 2px 12px;
 }
 .customAccordianHeader > .form-control{
 	outline: none;
 	box-shadow: none;
 }
 .customAccordianHeader > select.form-control{
 	width: 150px;
 	height: 26px;
 	padding: 0 6px;
 	margin-right: 20px;
 	float: left;
 }
 .customAccordianHeader > select.form-control[disabled]{
 	border: none;
 	-webkit-appearance: none;
 	-moz-appearance: none;
 	appearance: none;
 	background-color: transparent;
 	color: #f90;
 	width: auto;
 }
 .customAccordianHeader > input.form-control{
 	width: 80px;
 	height: 26px;
 	padding: 0 6px;
 	float: left;
 }
 .customAccordianHeader > input.form-control[disabled]{
 	border: none;
 	-webkit-appearance: none;
 	-moz-appearance: none;
 	appearance: none;
 	background-color: transparent;
 	color: #333;
 }
 .customAccordianTabBody{
 	width: 100%;
 	height: auto;
 	padding: 15px;
 	border: 1px solid #ddd;
 	border-top: 0;
 	border-radius: 0 0 3px 3px;
 }
 .customTableWithFilter{
 	width: auto;
 	height: auto;
 }
 .customTableWithFilter th{
 	padding: 5px;
 	background-color: #f3f3f3;
 	border: 1px solid #ddd;
 }
 .customTableWithFilter th i{
 	margin-top: 3px;
 }
 .customTableWithFilter th span{
 	font-size: 11px;
 	color: #222;
 }
 .customTableWithFilter th input{
 	width: 50px;
 }
 .customTableWithFilter td{
 	padding: 5px;
 	border: 1px solid #ddd;
 }
 .customTableWithFilter td span{
 	font-size: 11px;
 }
 .customTableWithFilter td span:first-child{
 	color: #449d44;
 	font-weight: bold;
 }
 .customTableWithFilter td span:last-child{
 	color: #c9302c;
 	font-style: italic;
 	font-weight: bold;
 }
 .customTableWithFilter td .tierTextBox{
 	width: 70px;
 }
 .customTableWithFilter .addTierButton{
 	color: #fff;
 	background-color: #2196f3;
 	border: none;
 	padding: 3px 5px;
 }
 .customTableWithFilter td .fa-trash-o{
 	color: #fff;
 	background-color: #c9302c;
 	padding: 5px;
 	border-radius: 3px;
 	cursor: pointer;
 }
 .resizeTextarea{
 	resize: vertical;
 	margin-top: 20px;
 }
 .new-widget-content{
 	padding: 0 0 0 0 !important;
 }
 .new-tab-heading{
 	padding: 5px;
 	color: #333;
 	background-color: #fcfcfc;
 	border-bottom: 1px solid #d5d5d5;
 	border-right: 1px solid #d5d5d5;
 }
 .new-tab-body{
 	border-right: 1px solid #d5d5d5;
 	border-bottom: 1px solid #d5d5d5;
 	padding-left: 15px;
 	padding-bottom: 5px;
 }
 .new-tab-heading i.fa{
 	font-size: 16px;
 	cursor: pointer;
 }
 .new-tab-heading span{
 	font-size: 14px;
 	margin-left: 5px;
 }
 .new-tab-heading i.fa-plus-circle{
 	color: #067dfc;
 }
 .new-tab-heading i.fa-minus-circle{
 	color: #d00d09;
 }
 .new-tab-body-th{
 	color: #333;
 }
 .new-tab-body-th > div{
 	font-size: 12px;
 	font-weight: bold;
 	padding-right: 5px;
 	padding-left: 5px;
 	text-align: center;
 }
 .new-tab-body-th > div:first-child{
 	font-size: 14px;
 	font-weight: bold;
 	text-align: left;
 }
 .new-tab-body-td i.fa-plus-circle{
 	color: #067dfc;
 }
 .new-tab-body-td i.fa-minus-circle{
 	color: #d00d09;
 }
 .new-tab-body-td input{
 	width: 50px;
 	height: 24px;
 }
 .new-tab-body-td .fa{
 	font-size: 14px;
 }
 .new-tab-body-td > div:first-child > div{
 	padding-right: 5px;
 	padding-left: 5px;
 	text-align: center;
 }
 .new-tab-body-td > div:first-child > div:first-child{
 	text-align: left;
 }
 .appliesTableHeading{
 	border: 1px solid #d5d5d5;
 	padding: 5px;
 	color: #333;
 	font-weight: bold;
 	background-color: #fcfcfc;
 	margin: 10px 0 0 0;
 }
 .appliesTableBody{
 	border: 1px solid #d5d5d5;
 	border-top: 0;
 	background-color: #ffffe0;
 	margin-bottom: 10px;
 	height: auto;
 }
 .appliesTableBody > div.firstDiv{
 	height: 100px;
 	float: left;
 	width: 40%;
 	border-right: 1px solid #d5d5d5;
 	overflow: auto;
 	padding: 5px;
 }
 .appliesTableBody > div.lastDiv{
 	width: 59%;
 	height: 100px;
 	padding: 5px;
 	float: left;
 }
 .appliesTableBody > div.lastDiv textarea{
 	width: 40%;
 	height: 60px;
 	margin: 15px 0;
 	resize: none;
 	float: left;
 }
 .reportedByTag{
 	width: 60%;
 	height: 80px;
 	border-top: 10px solid #393;
 	border-left: 10px solid #6c6;
 	border-radius: 5px 0 0 5px;
 	background-color: #d7d7d7;
 	float: right;
 	position: relative;
     right: -13px;
     margin-top: 5px;
     font-size: 11px;
 }
 .confirmedTag{
 	background-color: #393;
 	color: #fff;
 	-webkit-transform: rotate(-90deg);
     -moz-transform: rotate(-90deg);
     -o-transform: rotate(-90deg);
     -ms-transform: rotate(-90deg);
     transform: rotate(-90deg);
     position: absolute;
     bottom: 25px;
     left: -24px;
     width: 71px;
     text-align: center;
     font-size: 11px;
 }
 .reportedByTag table{
 	margin-left: 27px;
 	width: calc(100% - 27px);
 }
 .reportedByTag table td{
 	font-size: 11px;
 	text-align: center;
 	font-weight: bold;
 }
 .reportedByTag table tr:last-child td{
 	text-align: left;
 	font-weight: normal;
 	font-size: 10px;
 }
 .feeManagerRight{
 	min-height: 70px;
 	position: relative;
 }
 .feeManagerRight div{
 	position: absolute;
 	bottom: 0;
 	width: 100%;
 }
 .new-tab-body-td{
 	padding: 5px 0;
 }
 /*  new checkbox slide css */
 .onoffswitch {
     position: relative; width: 80px;
     -webkit-user-select:none;
     -moz-user-select:none;
     -ms-user-select: none;
     margin: auto;
 }
 .onoffswitch-checkbox {
     display: none;
 }
 .onoffswitch-label {
     display: block;
     overflow: hidden;
     cursor: pointer;
     border: 2px solid #999999;
     border-radius: 0px;
 }
 .onoffswitch-inner {
     display: block;
     width: 200%;
     margin-left: -100%;
     transition: margin 0.3s ease-in 0s;
 }
 .onoffswitch-inner:before, .onoffswitch-inner:after {
     display: block;
     float: left;
     width: 50%;
     height: 18px;
     padding: 0;
     line-height: 18px;
     font-size: 10px;
     color: white;
     font-family: Trebuchet, Arial, sans-serif;
     font-weight: bold;
     box-sizing: border-box;
 }
 .onoffswitch-inner:before {
     content: "Include";
     padding-left: 5px;
     background-color: #016ADB; color: #FFFFFF;
     text-align: left;
 }
 .onoffswitch-inner:after {
     content: "Exclude";
     padding-right: 5px;
     background-color: ; color: #333333;
     text-align: right;
 }
 .onoffswitch-switch {
     display: block;
     width: 25px;
     margin: -3.5px;
     background: #FFFFFF;
     position: absolute;
     top: 0;
     bottom: 0;
     right: 58px;
     border: 2px solid #999999;
     border-radius: 0px;
     transition: all 0.3s ease-in 0s;
 }
 .onoffswitch-switch i{
 	line-height: 25px;
 }
 .onoffswitch-checkbox:checked + .onoffswitch-label .onoffswitch-inner {
     margin-left: 0;
 }
 .onoffswitch-checkbox:checked + .onoffswitch-label .onoffswitch-switch {
     right: 0px;
 }
 .onoffswitch-checkbox fa-check{
 	color: #00ff00;
 }
 .onoffswitch-checkbox fa-times{
 	color: #ff0000;
 }
 .newButtons{
 	background-color: #fff;
 	border-radius: 10px;
 	color: #333;
 	border: 1px solid #eee;
 	box-shadow: 5px 5px 6px rgba(0,0,0,0.3);
 	padding: 6px 15px;
 	margin-right: 10px;
 }
 .newButtons:disabled{
 	background-color: #eee;
 }
 *{
 	outline: none;
 }
 /*   my custom modal  */
 .customBackdrop{
 	position: fixed;
 	background-color: rgba(0, 0, 0, 0.15);
 	top: 0;
 	left: 0;
 	width: 100%;
 	height: 100%;
 	z-index: 999;
 }
 .customModalInner{
 	width: 100%;
 	max-width: 500px;
 	height: 200px;
 	top: 15%;
 	position: relative;
 	margin: auto;
 }
 .customModelHead, .customModelFooter{
 	width: 100%;
 	background-color: #fafafa;
 	border-bottom: 1px solid #ccc;
 	color: #333;
 	padding: 10px;
 }
 .customModelFooter{
 	border-top: 1px solid #ccc;
 }
 .customModelBody{
 	width: 100%;
 	height: auto;
 	background-color: #fff;
 	color: #333;
 	padding: 10px;
 }
 .customModelHead p{
 	margin-bottom: 0;
 	font-size: 14px;
 }
 .customModelFooter button{
 	border: 1px solid #ccc;
 }
 .customModelFooter input[type="submit"]{
 	background-color: #6ad46a;
 	border: 1px solid #ccc;
 }
 /*  custom confirmation model */
 .customConfirmPopBackdrop{
 	position: fixed;
 	background-color: rgba(0, 0, 0, 0.3);
 	top: 0;
 	left: 0;
 	width: 100%;
 	height: 100%;
 	z-index: 999999999;
 	display: none;
 }
 .customConfirmPopBackdrop .customModalInner{
 	top: 30%;
 }
 /*  tier list table */
 .tierListWrap{
 	width: 120px;
 	height: auto;
 	float: left;
 }
 .tierListHead{
 	width: 100%;
 	padding: 5px;
 	background-color: #f3f3f3;
     border: 1px solid #ddd;
     border-right: none;
 }
 .tierListBody{
 	width: 100%;
 	padding: 5px;
 	border: 1px solid #ddd;
 	border-top: none;
 	border-right: none;
 }
 .minTierSpan{
 	color: #449d44;
 	font-weight: bold;
 	font-size: 11px;
 }
 .maxTierSpan{
 	color: #c9302c;
 	font-style: italic;
 	font-size: 11px;
 	font-weight: bold;
 }
 .tierHeadingSpan{
 	font-size: 11px;
 	color: #222;
 	font-weight: bold;
 }
 .tierListHead input{
 	width: 50px;
 	height: 24px;
 }
 .addTierBtn{
 	color: #fff;
 	background-color: #2196f3;
 	border: none;
 	padding: 1px 5px;
 }
 .deleteTierIcon{
 	color: #fff;
 	background-color: #c9302c;
 	padding: 5px;
 	border-radius: 3px;
 	cursor: pointer;
 }
 .customToogle {
 	padding: 2px 6px !important;
 	height: auto !important;
 	min-height: 28px !important;
 }
 .myLoader{
 	width: 100%;
 	height: 100%;
 	position: fixed;
 	z-index: 9999;
 	top: 0;
 	left: 0;
 	text-align: center;
 	background-color: rgba(0, 0, 0, 0.2);
 }
 .myLoader img{
 	position: relative;
 	top: calc(50% - 25px);
 }
 .customErrorInput{
     background-color: rgb(251, 227, 228);
     border: 1px solid #fbc2c4;
     color: #8a1f11;
 }
 .customErrorMessage{
     color: #8a1f11;
     font-weight: bold;
 }
 .ui-datepicker .ui-widget-header{
 	background-image: none !important;
 }
 .recordCountSelect{
 	background-color: #fff;
+}
+.exportBtn{
+	margin-top: 20px;
+}
+.select2-container .select2-choice{
+	height: 34px !important;
+	padding: 6px 12px !important;
+	border: 1px solid #ccc !important;
+	background-image: none !important;
+}
+.select2-container .select2-choice .select2-arrow{
+	border-left: none !important;
+	background: transparent !important;
+}
+.select2-container .select2-choice{
+	padding: 2px 12px !important;
 }

app/index.html

Diff comments View file @8f7dbe9

 <html ng-app="acufuel">
    <head lang="en">
       <meta charset="utf-8">
       <meta name="viewport" content="width=device-width, initial-scale=1.0">
       <meta name="description" content="">
       <meta name="author" content="">
       <title>Acufuel</title>
       <!-- styles -->
       <link rel="stylesheet" href="css/ui-lightness/jquery-ui-1.10.0.custom.min.css"/>
       <link rel="stylesheet" href="bower_components/bootstrap/dist/css/bootstrap.css"/>
       <link rel="stylesheet" href="bower_components/font-awesome/css/font-awesome.min.css"/>
       <link rel="stylesheet" href="bower_components/bootstrap-toggle/css/bootstrap-toggle.min.css" />
       <link rel="stylesheet" href="bower_components/fullcalendar/dist/fullcalendar.min.css"/>
       <link rel="stylesheet" href="bower_components/fullcalendar/dist/fullcalendar.print.min.css"/>
       <link rel="stylesheet" href="bower_components/toastr/toastr.min.css"/>
       <link rel="stylesheet" href="bower_components/angular-bootstrap/ui-bootstrap-csp.css"/>
       <link href="bower_components/jqGrid/css/ui.jqgrid.css" rel="stylesheet">
       <link href="bower_components/angular-xeditable/dist/css/xeditable.css" rel="stylesheet">
       <link href="bower_components/angular-bootstrap-toggle/dist/angular-bootstrap-toggle.min.css"
                 rel="stylesheet">
       <link rel="stylesheet" href="css/main.css"/>
       <link rel="stylesheet" href="css/base-admin-3.css"/>
       <link rel="stylesheet" href="css/base-admin-3-responsive.css"/>
       <link rel="stylesheet" href="css/custom.css"/>
       <link href="css/bootstrap-responsive.min.css" rel="stylesheet">
       <link href="http://fonts.googleapis.com/css?family=Open+Sans:400italic,600italic,400,600" rel="stylesheet">
       <link href="js/plugins/cirque/cirque.css" rel="stylesheet">
       <link href="css/pages/dashboard.css" rel="stylesheet">
       <link href="js/plugins/faq/faq.css" rel="stylesheet">
       <link href="css/pages/plans.css" rel="stylesheet">
       <link href="js/plugins/lightbox/themes/evolution-dark/jquery.lightbox.css" rel="stylesheet">
       <link href="js/plugins/msgGrowl/css/msgGrowl.css" rel="stylesheet">
       <link href="js/plugins/msgbox/jquery.msgbox.css" rel="stylesheet">
       <link href="css/pages/pricing.css" rel="stylesheet">
       <link href="css/pages/reports.css" rel="stylesheet">
       <link href="http://ajax.googleapis.com/ajax/libs/jqueryui/1.10.3/themes/smoothness/jquery-ui.min.css" rel="stylesheet" type="text/css" />
       <link rel="stylesheet" type="text/css" href="css/ngTable.css">
+      <link rel="stylesheet" href="bower_components/select2/select2.css">
       <!-- <link rel="stylesheet"; href="https://unpkg.com/ng-table@2.0.2/bundles/ng-table.min.css"> -->
    </head>
    <body>
       <!-- views -->
       <!-- scripts -->
       <script src="bower_components/jquery/dist/jquery.min.js"></script>
       <script src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.10.3/jquery-ui.min.js"></script>
       <script src="js/libs/jquery-ui-1.10.0.custom.min.js"></script>
       <!--<script src="js/plugins/flot/jquery.flot.js"></script>
       <script src="js/plugins/flot/jquery.flot.pie.js"></script>
       <script src="js/plugins/flot/jquery.flot.resize.js"></script>
       <script src="js/plugins/flot/jquery.flot.orderBars.js"></script>-->
       <script src="js/plugins/hoverIntent/jquery.hoverIntent.minified.js"></script>
       <script src="js/plugins/lightbox/jquery.lightbox.min.js"></script>
       <script src="js/plugins/validate/jquery.validate.js"></script>
       <script src="js/plugins/msgbox/jquery.msgbox.min.js"></script>
       <script src="bower_components/angular/angular.min.js"></script>
       <script src="bower_components/angular-route/angular-route.js"></script>
       <script src="bower_components/angular-cookies/angular-cookies.min.js"></script>
       <script src="bower_components/angular-resource/angular-resource.min.js"></script>
       <script src="bower_components/angular-animate/angular-animate.js"></script>
       <script src="bower_components/bootstrap/dist/js/bootstrap.js"></script>
       <script src="bower_components/bootstrap-toggle/js/bootstrap-toggle.min.js"></script>
       <script src="bower_components/angular-ui-router/release/angular-ui-router.min.js"></script>
       <script src='bower_components/moment/min/moment.min.js'></script>
       <script src="bower_components/fullcalendar/dist/fullcalendar.min.js"></script>
       <script src='bower_components/toastr/toastr.min.js'></script>
       <script src="bower_components/angular-bootstrap/ui-bootstrap.min.js"></script>
       <script src="bower_components/angular-bootstrap/ui-bootstrap-tpls.min.js"></script>
       <script src="bower_components/jqGrid/js/i18n/grid.locale-en.js"></script>
       <script src="bower_components/jqGrid/js/jquery.jqGrid.min.js"></script>
       <script src="bower_components/angular-xeditable/dist/js/xeditable.js"></script>
       <script src="bower_components/angular-bootstrap-toggle/dist/angular-bootstrap-toggle.min.js"></script>
+      <script src="bower_components/select2/select2.js"></script>
+      <script src="bower_components/angular-ui-select2/src/select2.js"></script>
       <!-- <script src="https://unpkg.com/ng-table@2.0.2/bundles/ng-table.min.js"></script> -->
       <!--
       <script src="scripts/inspinia.js"></script>
       <script src="plugins/iCheck/icheck.min.js"></script>
        -->
 <!--       <script src="./js/Application.js"></script>
      <script src="js/charts/area.js"></script>
       <script src="js/charts/donut.js"></script>
       <script src="js/charts/pie.js"></script>
       <script src="js/charts/bar.js"></script>
       <script src="js/demo/validation.js"></script>
       <script src="js/charts/line.js"></script> -->
       <script src="js/demo/faq.js"></script>
       <script src="js/plugins/faq/faq.js"></script>
       <script src="js/demo/gallery.js"></script>
       <script src="js/demo/sliders.js"></script>
       <script src="js/plugins/msgGrowl/js/msgGrowl.js"></script>
       <script src="js/demo/notifications.js"></script>
       <script src="js/ngTable.js"></script>
       <script src="http://cdn.ckeditor.com/4.6.1/standard-all/ckeditor.js"></script>
       <script src="https://code.highcharts.com/maps/highmaps.js"></script>
       <script src="https://code.highcharts.com/maps/modules/data.js"></script>
       <script src="https://code.highcharts.com/mapdata/countries/us/us-all.js"></script>
  <!-- Controllers -->
       <script src="js/app.js"></script>
       <script src="js/app.constant.js"></script>
       <script src="partials/login/login.controller.js"></script>
       <script src="partials/customers/customers.controller.js"></script>
       <script src="partials/analytics/analytics.controller.js"></script>
       <script src="partials/account/account.controller.js"></script>
       <script src="partials/elements/elements.controller.js"></script>
       <script src="partials/error/error.controller.js"></script>
       <script src="partials/faq/faq.controller.js"></script>
       <script src="partials/forms/forms.controller.js"></script>
       <script src="partials/fuelManager/fuelManager.controller.js"></script>
       <script src="partials/pricing/pricing.controller.js"></script>
       <script src="partials/reports/reports.controller.js"></script>
       <script src="partials/scheduler/scheduler.controller.js"></script>
       <script src="partials/signup/signup.controller.js"></script>
       <script src="partials/updateFuelManager/updateFuelManager.controller.js"></script>
       <script src="partials/viewCompany/viewCompany.controller.js"></script>
       <script src="partials/dashboard/dashboard.controller.js"></script>
       <script src="partials/fuelOrders/fuelOrders.controller.js"></script>
       <script src="partials/DispatchFuel/DispatchFuel.controller.js"></script>
       <script src="partials/searchDispatchFuel/searchDispatchFuel.controller.js"></script>
       <script src="partials/Accept/Accept.controller.js"></script>
       <!-- <script src="partials/AircraftList/AircraftList.controller.js"></script> -->
       <script src="partials/ContactView/ContactView.controller.js"></script>
       <script src="partials/FuelVendors/FuelVendors.controller.js"></script>
       <script src="partials/delselected/delselected.controller.js"></script>
       <script src="partials/pricingcontact/pricingcontact.controller.js"></script>
       <script src="partials/viewcontact/viewcontact.controller.js"></script>
       <script src="partials/viewFuelVendor/viewFuelVendor.controller.js"></script>
       <script src="partials/accountSetting/accountSetting.Controller.js"></script>
       <script src="partials/viewVendorContact/viewVendorContact.Controller.js"></script>
+      <script src="partials/enterFuelOrder/enterFuelOrder.controller.js"></script>
       <script src="partials/main/main.controller.js"></script>
       <div ui-view></div>
  <!-- End controllers -->
  <!-- services -->
       <script src="partials/login/login.service.js"></script>
       <script src="partials/customers/customers.service.js"></script>
       <script src="partials/analytics/analytics.service.js"></script>
       <script src="partials/account/account.service.js"></script>
       <script src="partials/elements/elements.service.js"></script>
       <script src="partials/error/error.service.js"></script>
       <script src="partials/faq/faq.service.js"></script>
       <script src="partials/forms/forms.service.js"></script>
       <script src="partials/fuelManager/fuelManager.service.js"></script>
       <script src="partials/pricing/pricing.service.js"></script>
       <script src="partials/reports/reports.service.js"></script>
       <script src="partials/scheduler/scheduler.service.js"></script>
       <script src="partials/signup/signup.service.js"></script>
       <script src="partials/updateFuelManager/updateFuelManager.service.js"></script>
       <script src="partials/viewCompany/viewCompany.service.js"></script>
       <script src="partials/dashboard/dashboard.service.js"></script>
       <script src="partials/fuelOrders/fuelOrders.service.js"></script>
       <script src="partials/DispatchFuel/DispatchFuel.service.js"></script>
       <script src="partials/searchDispatchFuel/searchDispatchFuel.service.js"></script>
       <script src="partials/Accept/Accept.service.js"></script>
       <!-- <script src="partials/AircraftList/AircraftList.controller.js"></script> -->
       <script src="partials/ContactView/ContactView.service.js"></script>
       <script src="partials/FuelVendors/FuelVendors.service.js"></script>
       <script src="partials/delselected/delselected.service.js"></script>
       <script src="partials/pricingcontact/pricingcontact.service.js"></script>
       <script src="partials/viewcontact/viewcontact.service.js"></script>
       <script src="partials/viewFuelVendor/viewFuelVendor.service.js"></script>
       <script src="partials/accountSetting/accountSetting.Service.js"></script>
       <script src="partials/viewVendorContact/viewVendorContact.Service.js"></script>
+      <script src="partials/enterFuelOrder/enterFuelOrder.service.js"></script>
       <script src="partials/main/main.service.js"></script>
    </body>
 </html>

app/js/app.constant.js

Diff comments View file @8f7dbe9

1	(function(){	1	(function(){
2	'use strict';	2	'use strict';
3		3
4	angular.module('acufuel')	4	angular.module('acufuel')
5		5
6	.constant('BASE_URL', {	6	.constant('BASE_URL', {
7	url: 'http://54.149.169.33:8080/ws'	7	url: 'http://54.149.169.33:8080/ws'
8	//url: 'http://192.168.1.175:8080/ws'	8	//url: 'http://192.168.2.178:8080/ws'
9	//url: 'http://192.168.1.8:8080/ws'	9	//url: 'http://192.168.1.8:8080/ws'
10		10
11	})	11	})
12		12
13	.constant('AUTH_EVENTS', {	13	.constant('AUTH_EVENTS', {
14	updateUser: 'update-user',	14	updateUser: 'update-user',
15	notAuthorized: 'auth-not-authorized'	15	notAuthorized: 'auth-not-authorized'
16	})	16	})
17		17
18	.constant('USER_ROLES', {	18	.constant('USER_ROLES', {
19	user : 'user',	19	user : 'user',
20	admin: 'admin'	20	admin: 'admin'
21	});	21	});
22		22
23	})();	23	})();

app/js/app.js

Diff comments View file @8f7dbe9

 'use strict';
-  angular.module('acufuel', ['ngCookies', 'ngResource', 'ui.router', 'ngAnimate', 'ui.bootstrap', 'xeditable', 'ui.toggle', 'ngTable'])
+  angular.module('acufuel', ['ngCookies', 'ngResource', 'ui.router', 'ngAnimate', 'ui.bootstrap', 'xeditable', 'ui.toggle', 'ngTable', 'ui.select2'])
     .config(['$httpProvider', function($httpProvider) {
       $httpProvider.defaults.withCredentials = true;
       $httpProvider.interceptors.push('myCSRF');
       $httpProvider.interceptors.push('httpRequestInterceptor');
     }])
     .factory('httpRequestInterceptor', ['$q', '$rootScope', '$location', function($q, $rootScope, $location) {
        return {
            request: function($config) {
              return $config;
            },
            responseError: function(rejection) {
              if (rejection.status === 401) {
                if($location.path() != "/login"){
                    localStorage.clear();
                    window.location.reload();
                }
              }
              return $q.reject(rejection);
            }
          }
      }])
     .provider('myCSRF',[function(){
       var headerName = 'X-CSRFToken';
       var cookieName = 'csrftoken';
       var allowedMethods = ['GET'];
       this.setHeaderName = function(n) {
         headerName = n;
       }
       this.setCookieName = function(n) {
         cookieName = n;
       }
       this.setAllowedMethods = function(n) {
         allowedMethods = n;
       }
       this.$get = ['$cookies', function($cookies){
         return {
           'request': function(config) {
             if(allowedMethods.indexOf(config.method) === -1) {
               // do something on success
               config.headers[headerName] = $cookies[cookieName];
             }
             return config;
           }
         }
       }];
     }])
   .config(
       ['$locationProvider', '$stateProvider', '$urlRouterProvider',
         function($locationProvider, $stateProvider, $urlRouterProvider) {
           $locationProvider.hashPrefix('!');
           // routes
           $urlRouterProvider
               .otherwise('/login');
           $stateProvider
             .state("app", {
               url: "",
               templateUrl: "partials/main/main.html",
               controller: "MainController",
               abstract: true
             })
             .state("login", {
               url: "/login",
               templateUrl: "partials/login/login.html",
               controller: "LoginController"
             })
             .state("app.customers", {
               url: "/customers",
               templateUrl: "partials/customers/customers.html",
               controller: "customersController"
             })
             .state("app.accountSetting", {
               url: "/accountSetting",
               templateUrl: "partials/accountSetting/accountSetting.html",
               controller: "AccountSettingController"
             })
             .state("app.ContactView", {
               url: "/ContactView",
               templateUrl: "partials/ContactView/ContactView.html",
               controller: "ContactViewController"
             })
             .state("app.FuelVendors", {
               url: "/FuelVendors",
               templateUrl: "partials/FuelVendors/FuelVendors.html",
               controller: "FuelVendorsController"
             })
             .state("app.analytics", {
               url: "/analytics",
               templateUrl: "partials/analytics/analytics.html",
               controller: "analyticsController"
             })
             .state("app.account", {
               url: "/account",
               templateUrl: "partials/account/account.html",
               controller: "accountController"
             })
             .state("app.dashboard", {
               url: "/dashboard",
               templateUrl: "partials/dashboard/dashboard.html",
               controller: "dashboardController"
             })
             .state("app.elements", {
               url: "/elements",
               templateUrl: "partials/elements/elements.html",
               controller: "elementsController"
             })
             .state("app.error", {
               url: "/error",
               templateUrl: "partials/error/error.html",
               controller: "errorController"
             })
             .state("app.faq", {
               url: "/faq",
               templateUrl: "partials/faq/faq.html",
               controller: "faqController"
             })
             .state("app.forms", {
               url: "/forms",
               templateUrl: "partials/forms/forms.html",
               controller: "formsController"
             })
             .state("app.fuelManager", {
               url: "/fuelManager",
               templateUrl: "partials/fuelManager/fuelManager.html",
               controller: "fuelManagerController"
             })
             .state("app.pricing", {
               url: "/pricing",
               templateUrl: "partials/pricing/pricing.html",
               controller: "pricingController"
             })
             .state("app.reports", {
               url: "/reports",
               templateUrl: "partials/reports/reports.html",
               controller: "reportsController"
             })
             .state("app.scheduler", {
               url: "/scheduler",
               templateUrl: "partials/scheduler/scheduler.html",
               controller: "schedulerController"
             })
             .state("app.signup", {
               url: "/signup",
               templateUrl: "partials/signup/signup.html",
               controller: "signupController"
             })
             .state("app.updateFuelManager", {
               url: "/updateFuelManager",
               templateUrl: "partials/updateFuelManager/updateFuelManager.html",
               controller: "updateFuelManagerController",
               // data: {
               //     authorizedRoles: ["fbo"],
               // }
             })
             .state("app.viewCompany", {
               url: "/viewCompany/:id",
               templateUrl: "partials/viewCompany/viewCompany.html",
               controller: "viewCompanyController"
             })
             .state("app.viewFuelVendor", {
               url: "/viewFuelVendor/:id",
               templateUrl: "partials/viewFuelVendor/viewFuelVendor.html",
               controller: "ViewFuelVendorController"
             })
             .state("app.fuelOrders", {
               url: "/fuelOrders",
               templateUrl: "partials/fuelOrders/fuelOrders.html",
               controller: "fuelOrdersController"
             })
              .state("app.DispatchFuel", {
               url: "/DispatchFuel",
               templateUrl: "partials/DispatchFuel/DispatchFuel.html",
               controller: "DispatchFuelController"
             })
             .state("app.searchDispatchFuel", {
               url: "/searchDispatchFuel",
               templateUrl: "partials/searchDispatchFuel/searchDispatchFuel.html",
               controller: "searchDispatchFuelController"
             })
             .state("app.Accept", {
               url: "/Accept",
               templateUrl: "partials/Accept/Accept.html",
               controller: "AcceptController"
             })
             .state("app.delselected", {
               url: "/delselected",
               templateUrl: "partials/delselected/delselected.html",
               controller: "delselectedController"
             })
             .state("app.pricingcontact", {
               url: "/pricingcontact",
               templateUrl: "partials/pricingcontact/pricingcontact.html",
               controller: "pricingcontactController"
             })
             .state("app.viewContact", {
               url: "/viewContact/:id",
               templateUrl: "partials/viewcontact/viewcontact.html",
               controller: "viewcontactController"
             })
             .state("app.viewVendorContact", {
               url: "/viewVendorContact/:id",
               templateUrl: "partials/viewVendorContact/viewVendorContact.html",
               controller: "viewVendorContactController"
             })
+            .state("app.enterFuelOrder", {
+              url: "/enterFuelOrder",
+              templateUrl: "partials/enterFuelOrder/enterFuelOrder.html",
+              controller: "enterFuelOrderController"
+            })
         }
   ])
   .run(['$rootScope', '$state', 'LoginService', 'AUTH_EVENTS', function($rootScope, $state, LoginService, AUTH_EVENTS) {
       $rootScope.$on('$stateChangeStart', function (event, next, nextParams, fromState) {
           $rootScope.currentUser = JSON.parse(window.localStorage.getItem('currentUser'));
           LoginService.isAuthorized = function (authorizedRoles) {
               if (!angular.isArray(authorizedRoles)) {
                   authorizedRoles = [authorizedRoles];
               }
               var userdata = JSON.parse(window.localStorage.getItem('currentUser'));
               return (userdata? (authorizedRoles.indexOf(userdata.type) !== -1): false);
           }
           if ('data' in next && 'authorizedRoles' in next.data) {
             var authorizedRoles = next.data.authorizedRoles;
             if (!LoginService.isAuthorized(authorizedRoles)) {
               event.preventDefault();
               if($state.current.name.length == 0) {
                 $state.go('login')
               } else {
                 $state.go($state.current, {}, {reload: true});
                 $rootScope.$broadcast(AUTH_EVENTS.notAuthorized);
               }
             }
           }
           if (LoginService.isAuthenticated()) {
             if (next.name == 'login') {
               event.preventDefault();
               $state.go('app.dashboard');
             }
           }
       });
   }])
     .directive("datepicker",function(){
       return {
         restrict:"A",
         link:function(scope,el,attr){
           el.datepicker();
         }
       };
     })

app/partials/ContactView/ContactView.html

Diff comments View file @8f7dbe9

 <style>
    .subnavbar .mainnav > li:nth-child(3) > a{
    color: #ff9900;
    }
 </style>
 <div class="main">
    <div class="container">
       <div class="row">
          <div class="col-md-12">
             <div class="widget stacked ">
                <div class="widget-content">
                   <div class="tabbable">
                      <ul class="nav nav-tabs">
                         <li>
                            <a ui-sref="app.customers">Company View
                               <i class="fa fa-caret-down" aria-hidden="true"></i>
                            </a>
                         </li>
                         <li class="active">
                            <a ui-sref="app.ContactView">Contact View
                               <i class="fa fa-caret-down" aria-hidden="true"></i>
                            </a>
                         </li>
                         <li>
                            <a ui-sref="app.FuelVendors">Fuel Vendors
                               <i class="fa fa-caret-down" aria-hidden="true"></i>
                            </a>
                         </li>
                         <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>
                         <li><button type="button" class="btn btn-default btn-sm">Clear Search And Filters</button></li>
                         <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>
                      </ul>
                      <br>
                      <div class="tab-content customer-table" style="margin:0px">
                         <div class="tab-pane active" id="companyView">
 	                        <table ng-table="displayContactList" class="table table-striped table-condensed" show-filter="true">
 	                           <tr ng-repeat="row in $data track by row.id" style="cursor: pointer;" ui-sref="app.viewContact({id : row.id})">
 	                             <td data-title="'Last Name'" filter="{lastName: 'text'}" sortable="'lastName'">
 	                              {{row.lastName}}
 	                             </td>
 	                             <td data-title="'First Name'" filter="{firstName: 'text'}" sortable="'firstName'">
 	                              {{row.firstName}}
 	                             </td>
 	                             <td data-title="'Company Name'" filter="{owner: 'text'}" sortable="'owner'">
 	                              {{row.owner}}
 	                             </td>
 	                             <td data-title="'Work Phone'" filter="{workPhone: 'text'}" sortable="'workPhone'">
 	                              {{row.workPhone}}
 	                             </td>
 	                             <td data-title="'Mobile Phone'" filter="{mobilePhone: 'text'}" sortable="'mobilePhone'">
 	                              {{row.mobilePhone}}
 	                             </td>
 	                             <td data-title="'Title'" filter="{title: 'text'}" sortable="'title'">
 	                              {{row.title}}
 	                             </td>
 	                             <td data-title="'Pricing Email'">
 	                              <toggle ng-model="row.priceEmail" ng-change="changePriceEmail(row.id, $index)" size="customToogle"></toggle>
 	                             </td>
 	                             <td data-title="'User Name'" filter="{userName: 'text'}" sortable="'userName'">
 	                              {{row.userName}}
 	                             </td>
 	                           </tr>
 	                         </table>
+                            <button type="button" class="btn btn-warning exportBtn">Export Customers</button>
                            <!-- <table class="table table-striped">
                               <thead>
                                  <tr>
                                     <th>
                                        <input type="text" class="form-control" style="height:31px;" name="name" id="name">
                                        <label class="font-company">Last Name <i class="fa fa-sort" aria-hidden="true"></i></label>
                                     </th>
                                     <th>
                                        <input type="text" class="form-control" style="height:31px;" name="name" id="name">
                                        <label class="font-company">First Phone <i class="fa fa-sort" aria-hidden="true"></i></label>
                                     </th>
                                     <th>
                                        <input type="text" class="form-control" style="height:31px;" name="name" id="name">
                                        <label class="font-company">Company Name <i class="fa fa-sort" aria-hidden="true"></i></label>
                                     </th>
                                     <th>
                                        <input type="text" class="form-control" style="height:31px;" name="name" id="name">
                                        <label class="font-company">Work Phone <i class="fa fa-sort" aria-hidden="true"></i></label>
                                     <th>
                                        <input type="text" class="form-control" style="height:31px;" name="name" id="name">
                                        <label class="font-company">Mobile Phone <i class="fa fa-sort" aria-hidden="true"></i></label>
                                     </th>
                                     <th>
                                        <input type="text" class="form-control" style="height:31px;" name="name" id="name">
                                        <label class="font-company">Title <i class="fa fa-sort" aria-hidden="true"></i></label>
                                     </th>
                                     <th>
                                        <input type="text" class="form-control" style="height:31px;" name="name" id="name">
                                        <label class="font-company">Price Email<i class="fa fa-sort" aria-hidden="true"></i></label>
                                     </th>
                                     <th>
                                        <input type="text" class="form-control" style="height:31px;" name="name" id="name">
                                        <label class="font-company">Username<i class="fa fa-sort" aria-hidden="true"></i></label>
                                     </th>
                                  </tr>
                               </thead>
                               <tbody>
 									<tr ng-repeat="contact in contactList" style="cursor: pointer;" ui-sref="app.viewContact({id : contact.id})">
 										<td>{{contact.lastName}}</td>
 										<td>{{contact.firstName}}</td>
 										<td>{{contact.owner.companyName}}</td>
 										<td>{{contact.workPhone}}</td>
 										<td>{{contact.mobilePhone}}</td>
 										<td>{{contact.title}}</td>
 										<td>
                                  <toggle ng-model="contact.priceEmail" ng-change="changePriceEmail(contact.id, $index)" size="customToogle"></toggle>
                               </td>
                               <td>{{contact.userName}}</td>
 									</tr>
 								</tbody>
                            </table> -->
                            <!-- <div class="row" style="margin-left: 0px;">
                               <div class="col-md-2">
                                  <button type="button" class="btn btn-warning">Export Customers</button>
                               </div>
                               <div class="col-md-10">
                                  <div class="row" style="margin-left: 0px;">
                                     <div class="col-md-6">
                                     </div>
                                     <div class="col-md-2">
                                        <select class="form-control">
                                           <option>20 Records Per Page</option>
                                           <option>50 Records Per Page</option>
                                           <option>100 Records Per Page</option>
                                        </select>
                                     </div>
                                     <div class="col-md-4">
                                        <ul class="pagination" style="margin:0px">
                                           <li><a href="javascript:;">«</a></li>
                                           <li class="active"><a href="#">1</a></li>
                                           <li><a href="javascript:;">2</a></li>
                                           <li><a href="javascript:;">3</a></li>
                                           <li><a href="javascript:;">4</a></li>
                                           <li><a href="javascript:;">5</a></li>
                                           <li><a href="javascript:;">»</a></li>
                                        </ul>
                                     </div>
                                  </div>
                               </div>
                            </div> -->
                         </div>
                      </div>
                   </div>
                </div>
                <!-- /widget-content -->
             </div>
             <!-- /widget -->
          </div>
          <!-- /span8 -->
       </div>
       <!-- /row -->
    </div>
    <!-- /container -->
 </div>
 <!-- /main -->
 <form class="modal multi-step" id="contact-modal-3" name="companyForm">
     <div class="modal-dialog modal-lg">
         <div class="modal-content">
             <div class="modal-body step-1" data-step="1" style="padding: 0;">
                <div>
                   <div class="row" style="margin: 0;">
                      <div>
                         <div class="widget" style="margin-bottom: 0; box-shadow: none;">
                            <div class="widget-header">
                               <i class="icon-pencil"></i>
                               <i class="fa fa-tasks" aria-hidden="true"></i>
                               <h3>Add a New Contact</h3>
                               <div class="clearfix"></div>
                            </div>
                            <div class="widget-content" style="padding-left: 0; padding-right: 0; border-bottom: 0;">
                               <div class="col-xs-12">
                                  <div class="col-md-6">
                                     <div class="pull-left" style="width: 110px;">
                                        <label class="new-input-label"><b>First Name</b></label>
                                     </div>
                                     <div class="pull-left" style="margin-left: 15px;">
                                        <input type="tel" ng-model="data.firstName" class="form-control" placeholder="">
                                     </div>
                                     <div class="clearfix"></div>
                                  </div>
                                  <div class="col-md-6">
                                     <div class="pull-left" style="width: 110px;">
                                        <label class="new-input-label"><b>Last Name</b></label>
                                     </div>
                                     <div class="pull-left" style="margin-left: 15px;">
                                        <input type="tel" ng-model="data.lastName" class="form-control" id="Address" placeholder="">
                                     </div>
                                     <div class="clearfix"></div>
                                  </div>
                               </div>
                               <div class="clearfix"></div><br>
                               <div class="col-xs-12">
                                  <div class="col-md-6">
                                     <div class="pull-left" style="width: 110px;">
                                        <label class="new-input-label"><b>Title</b></label>
                                     </div>
                                     <div class="pull-left" style="margin-left: 15px;">
                                        <input type="tel" ng-model="data.title" class="form-control" id="Address" placeholder="">
                                     </div>
                                     <div class="clearfix"></div>
                                  </div>
                                  <div class="col-md-6">
                                     <div class="pull-left" style="width: 110px;">
                                        <label class="new-input-label"><b>Email</b></label>
                                     </div>
                                     <div class="pull-left" style="margin-left: 15px;">
                                        <input type="email" ng-model="data.email" class="form-control" id="Address" placeholder="">
                                     </div>
                                     <div class="clearfix"></div>
                                  </div>
                               </div>
                               <div class="clearfix"></div><br>
                               <div class="col-xs-12">
                                  <div class="col-md-6">
                                     <div class="pull-left" style="width: 110px;">
                                        <label class="new-input-label"><b>Username</b></label>
                                     </div>
                                     <div class="pull-left" style="margin-left: 15px;">
                                        <input type="tel" ng-model="data.userName" class="form-control" id="Address" placeholder="">
                                     </div>
                                     <div class="clearfix"></div>
                                  </div>
                                  <div class="col-md-6">
                                     <div class="pull-left" style="width: 110px;">
                                        <label class="new-input-label"><b>Password</b></label>
                                     </div>
                                     <div class="pull-left" style="margin-left: 15px;">
                                        <input type="password" ng-model="data.password" class="form-control" id="Address" placeholder="">
                                     </div>
                                     <div class="clearfix"></div>
                                  </div>
                               </div>
                               <div class="clearfix"></div><br>
                               <div class="col-xs-12">
                                  <div class="col-md-6">
                                     <div class="pull-left" style="width: 110px;">
                                        <label class="new-input-label"><b>Work Phone</b></label>
                                     </div>
                                     <div class="pull-left" style="margin-left: 15px;">
                                        <input type="tel" ng-model="data.workPhone" class="form-control" id="Address" placeholder="">
                                     </div>
                                     <div class="clearfix"></div>
                                  </div>
                                  <div class="col-md-6">
                                     <div class="pull-left" style="width: 110px;">
                                        <label class="new-input-label"><b>Mobile Phone</b></label>
                                     </div>
                                     <div class="pull-left" style="margin-left: 15px;">
                                        <input type="tel" ng-model="data.mobilePhone" class="form-control" id="Address" placeholder="">
                                     </div>
                                     <div class="clearfix"></div>
                                  </div>
                               </div>
                               <div class="clearfix"></div><br>
                               <div class="col-xs-12">
                                   <div class="col-md-12">
                                     <div class="pull-left" style="width: 110px;">
                                        <label class="new-input-label"><b>Address</b></label>
                                     </div>
                                     <div class="pull-right" style="width: calc(100% - 123px);">
                                        <input type="tel" class="form-control" ng-model="data.address" id="Address" placeholder="">
                                     </div>
                                     <div class="clearfix"></div>
                                  </div>
                               </div>
                               <div class="clearfix"></div><br>
                               <div class="col-xs-12">
                                   <div class="col-md-12">
                                     <div class="pull-left" style="width: 110px;">
                                        <label class="new-input-label"><b>Company</b></label>
                                     </div>
                                     <div class="pull-right" style="width: calc(100% - 123px);">
                                        <select class="form-control" ng-model="data.companyId">
                                           <option value="{{company.id}}" ng-repeat="company in companies">{{company.companyName}}</option>
                                         </select>
                                     </div>
                                     <div class="clearfix"></div>
                                  </div>
                               </div>
                               <div class="clearfix"></div>
                               <br/>
                               <div class="col-xs-12">
                                  <div class="col-md-3">
                                     <div class="pull-left my-toggle-switch">
                                        <div style="color: #ff9a01;">Price Email &nbsp &nbsp
                                           <toggle ng-model="data.priceEmail" size="customToogle"></toggle>
                                        </div>
                                     </div>
                                     <div class="clearfix"></div>
                                  </div>
                                  <div class="col-md-3">
                                     <div class="pull-left my-toggle-switch">
                                        <div style="color: #ff9a01;">Primary Contact &nbsp &nbsp
                                           <input type="checkbox" ng-model="data.primaryContact">
                                        </div>
                                     </div>
                                     <div class="clearfix"></div>
                                  </div>
                                  <div class="col-md-6">
                                     <div class="pull-left" style="width: 110px;">
                                        <label class="new-input-label"><b>Internal Note</b></label>
                                     </div>
                                     <div class="pull-left" style="width: calc(100% - 110px);">
                                        <textarea  name="message" ng-model="data.note" rows="4" cols="34"></textarea>
                                     </div>
                                  </div>
                                  <div class="clearfix"></div>
                               </div>
                               <div class="clearfix"></div><br>
                            </div>
                         </div>
                         <div class="clearfix"></div>
                      </div>
                   </div>
                </div>
             </div>
             <div class="modal-footer" style="border-top: 0;">
                 <button type="button" class="btn btn-default" ng-click="reset()" data-dismiss="modal">Cancel</button>
                 <button type="button" class="btn btn-primary step step-1" data-step="1" ng-click="addContact()">Save</button>
             </div>
         </div>
     </div>
 </form>
 <div class="customConfirmPopBackdrop" id="toogleMail">
    <div class="customModalInner" style="max-width: 400px;">
       <div class="customModelBody" style="border-radius: 5px 5px 0 0;">
          <table>
             <tr>
                <!-- <td>
                   <img src="" style="width: 50px;">
                </td> -->
                <td>
                   <p style="padding: 5px 10px; margin-bottom: 0;text-align: center;">{{messageText}}</p>
                </td>
             </tr>
          </table>
       </div>
       <div class="customModelFooter text-right" style="border-radius: 0 0 5px 5px;">
          <button class="btn" style="padding: 4px 0; width: 80px;" ng-click="cancelToogle()">Cancel</button>
       </div>
    </div>
 </div>

app/partials/FuelVendors/FuelVendors.html

Diff comments View file @8f7dbe9

1	<style>	1	<style>
2	.subnavbar .mainnav > li:nth-child(3) > a{	2	.subnavbar .mainnav > li:nth-child(3) > a{
3	color: #ff9900;	3	color: #ff9900;
4	}	4	}
5		5
6	.button1 {	6	.button1 {
7	display: inline-block;	7	display: inline-block;
8	height: 35px;	8	height: 35px;
9	line-height: 35px;	9	line-height: 35px;
10	padding-right: 15px;	10	padding-right: 15px;
11	padding-left: 50px;	11	padding-left: 50px;
12	position: relative;	12	position: relative;
13	background-color:rgb(41,127,184);	13	background-color:rgb(41,127,184);
14	color:rgb(255,255,255);	14	color:rgb(255,255,255);
15	text-decoration: none;	15	text-decoration: none;
16	text-transform: uppercase;	16	text-transform: uppercase;
17	letter-spacing: 1px;	17	letter-spacing: 1px;
18	margin-bottom: 15px;	18	margin-bottom: 15px;
19	border: 0;	19	border: 0;
20		20
21		21
22	border-radius: 5px;	22	border-radius: 5px;
23	-moz-border-radius: 5px;	23	-moz-border-radius: 5px;
24	-webkit-border-radius: 5px;	24	-webkit-border-radius: 5px;
25	text-shadow:0px 1px 0px rgba(0,0,0,0.5);	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;	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);	27	filter:progid:DXImageTransform.Microsoft.dropshadow(OffX=0,OffY=1,Color=#ff123852,Positive=true);
28		28
29	-moz-box-shadow:0px 2px 2px rgba(0,0,0,0.2);	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);	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);	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)";	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);	33	filter:progid:DXImageTransform.Microsoft.dropshadow(OffX=0,OffY=2,Color=#33000000,Positive=true);
34	}	34	}
35		35
36	.button1 span {	36	.button1 span {
37	position: absolute;	37	position: absolute;
38	left: 0;	38	left: 0;
39	top: 0;	39	top: 0;
40	width: 35px;	40	width: 35px;
41	background-color:rgba(0,0,0,0.5);	41	background-color:rgba(0,0,0,0.5);
42		42
43	-webkit-border-top-left-radius: 5px;	43	-webkit-border-top-left-radius: 5px;
44	-webkit-border-bottom-left-radius: 5px;	44	-webkit-border-bottom-left-radius: 5px;
45	-moz-border-radius-topleft: 5px;	45	-moz-border-radius-topleft: 5px;
46	-moz-border-radius-bottomleft: 5px;	46	-moz-border-radius-bottomleft: 5px;
47	border-top-left-radius: 5px;	47	border-top-left-radius: 5px;
48	border-bottom-left-radius: 5px;	48	border-bottom-left-radius: 5px;
49	border-right: 1px solid rgba(0,0,0,0.15);	49	border-right: 1px solid rgba(0,0,0,0.15);
50	}	50	}
51		51
52	.button1:hover span, .button1.active span {	52	.button1:hover span, .button1.active span {
53	background-color:rgb(0,102,26);	53	background-color:rgb(0,102,26);
54	border-right: 1px solid rgba(0,0,0,0.3);	54	border-right: 1px solid rgba(0,0,0,0.3);
55	}	55	}
56		56
57	.button1:active {	57	.button1:active {
58	margin-top: 2px;	58	margin-top: 2px;
59	margin-bottom: 13px;	59	margin-bottom: 13px;
60		60
61	-moz-box-shadow:0px 1px 0px rgba(255,255,255,0.5);	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);	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);	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)";	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);	65	filter:progid:DXImageTransform.Microsoft.dropshadow(OffX=0,OffY=1,Color=#ccffffff,Positive=true);
66	}	66	}
67		67
68	.button1.turquoise {	68	.button1.turquoise {
69	background: #449d44;	69	background: #449d44;
70	}	70	}
71		71
72	</style>	72	</style>
73	<div class="main">	73	<div class="main">
74	<div class="container">	74	<div class="container">
75	<div class="row">	75	<div class="row">
76	<div class="col-md-12">	76	<div class="col-md-12">
77	<div class="widget stacked ">	77	<div class="widget stacked ">
78	<div class="widget-content">	78	<div class="widget-content">
79	<div class="tabbable">	79	<div class="tabbable">
80	<ul class="nav nav-tabs">	80	<ul class="nav nav-tabs">
81	<li>	81	<li>
82	<a ui-sref="app.customers">Company View	82	<a ui-sref="app.customers">Company View
83	<i class="fa fa-caret-down" aria-hidden="true"></i>	83	<i class="fa fa-caret-down" aria-hidden="true"></i>
84	</a>	84	</a>
85	</li>	85	</li>
86	<li>	86	<li>
87	<a ui-sref="app.ContactView">Contact View	87	<a ui-sref="app.ContactView">Contact View
88	<i class="fa fa-caret-down" aria-hidden="true"></i>	88	<i class="fa fa-caret-down" aria-hidden="true"></i>
89	</a>	89	</a>
90	</li>	90	</li>
91	<li class="active">	91	<li class="active">
92	<a ui-sref="app.FuelVendors">Fuel Vendors	92	<a ui-sref="app.FuelVendors">Fuel Vendors
93	<i class="fa fa-caret-down" aria-hidden="true"></i>	93	<i class="fa fa-caret-down" aria-hidden="true"></i>
94	</a>	94	</a>
95	</li>	95	</li>
96	<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>	96	<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>
97	<li><button type="button" class="btn btn-default btn-sm">Clear Search And Filters</button></li>	97	<li><button type="button" class="btn btn-default btn-sm">Clear Search And Filters</button></li>
98	<li style="float:right"><button type="submit" data-toggle="modal" data-target="#vendor-modal-3" class="btn btn-success btn-sm"><i class="fa fa-plus" aria-hidden="true"></i> Add Vendor</button></li>	98	<li style="float:right"><button type="submit" data-toggle="modal" data-target="#vendor-modal-3" class="btn btn-success btn-sm"><i class="fa fa-plus" aria-hidden="true"></i> Add Vendor</button></li>
99	</ul>	99	</ul>
100	<br>	100	<br>
101	<div class="tab-content customer-table" style="margin:0px">	101	<div class="tab-content customer-table" style="margin:0px">
102	<div class="tab-pane active" id="companyView">	102	<div class="tab-pane active" id="companyView">
103	<table ng-table="displayVendorList" class="table table-striped table-condensed" show-filter="true">	103	<table ng-table="displayVendorList" class="table table-striped table-condensed" show-filter="true">
104	<tr ng-repeat="row in $data track by row.id" style="cursor: pointer;" ui-sref="app.viewFuelVendor({id : row.id})">	104	<tr ng-repeat="row in $data track by row.id" style="cursor: pointer;" ui-sref="app.viewFuelVendor({id : row.id})">
105	<td data-title="'Vendor Name'" filter="{vendorName: 'text'}" sortable="'vendorName'">	105	<td data-title="'Vendor Name'" filter="{vendorName: 'text'}" sortable="'vendorName'">
106	{{row.vendorName}}	106	{{row.vendorName}}
107	</td>	107	</td>
108	<td data-title="'Main Phone'" filter="{newContactNumber: 'text'}" sortable="'newContactNumber'">	108	<td data-title="'Main Phone'" filter="{newContactNumber: 'text'}" sortable="'newContactNumber'">
109	{{row.newContactNumber}}	109	{{row.newContactNumber}}
110	</td>	110	</td>
111	<td data-title="'Primary Contact'" filter="{primaryContactName: 'text'}" sortable="'primaryContactName'">	111	<td data-title="'Primary Contact'" filter="{primaryContactName: 'text'}" sortable="'primaryContactName'">
112	{{row.primaryContactName}}	112	{{row.primaryContactName}}
113	</td>	113	</td>
114		114
115	<td data-title="'Status'" filter="{activate: 'select'}" filter-data="statusFilter" sortable="'activate'">	115	<td data-title="'Status'" filter="{activate: 'select'}" filter-data="statusFilter" sortable="'activate'">
116	<button type="button" ng-if="row.activate == true" class="btn btn-success btn-xs">Active</button>	116	<button type="button" ng-if="row.activate == true" class="btn btn-success btn-xs">Active</button>
117	<button type="button" ng-if="row.activate == false" class="btn btn-warning btn-xs">InActive</button>	117	<button type="button" ng-if="row.activate == false" class="btn btn-warning btn-xs">InActive</button>
118	</td>	118	</td>
119	<td data-title="'Source'" filter="{source: 'text'}" sortable="'source'">	119	<td data-title="'Source'" filter="{source: 'text'}" sortable="'source'">
120	Vendor	120	Vendor
121	</td>	121	</td>
122	<td data-title="'Margin Setting'" filter="{masterMargin: 'select'}" filter-data="marginFilterOptions" sortable="'masterMargin'">	122	<td data-title="'Margin Setting'" filter="{masterMargin: 'select'}" filter-data="marginFilterOptions" sortable="'masterMargin'">
123	<select class="form-control" ng-change="editMargin(row)" style="height:31px;" ng-model="row.masterMargin" ng-selected="" ng-options="margin.id as margin.marginName for margin in jetMarginList" required></select>	123	<select class="form-control" ng-change="editMargin(row)" style="height:31px;" ng-model="row.masterMargin" ng-selected="" ng-options="margin.id as margin.marginName for margin in jetMarginList" required></select>
124	</td>	124	</td>
125	<td data-title="'All In'" filter="{allIn: 'text'}" sortable="'allIn'">	125	<td data-title="'All In'" filter="{allIn: 'text'}" sortable="'allIn'">
126	{{row.allIn}}	126	{{row.allIn}}
127	</td>	127	</td>
128	</tr>	128	</tr>
129	</table>	129	</table>
130		130
131		131	<button type="button" class="btn btn-warning exportBtn">Export Customers</button>
132		132
133	<!-- <table class="table table-striped">	133	<!-- <table class="table table-striped">
134	<thead>	134	<thead>
135	<tr>	135	<tr>
136	<th>	136	<th>
137	<input type="text" class="form-control" style="height:31px;" name="name" id="name">	137	<input type="text" class="form-control" style="height:31px;" name="name" id="name">
138	<label class="font-company">Vendor Name <i class="fa fa-sort" aria-hidden="true"></i></label>	138	<label class="font-company">Vendor Name <i class="fa fa-sort" aria-hidden="true"></i></label>
139	</th>	139	</th>
140		140
141	<th>	141	<th>
142	<input type="text" class="form-control" style="height:31px;" name="name" id="name">	142	<input type="text" class="form-control" style="height:31px;" name="name" id="name">
143	<label class="font-company">Main Phone <i class="fa fa-sort" aria-hidden="true"></i></label>	143	<label class="font-company">Main Phone <i class="fa fa-sort" aria-hidden="true"></i></label>
144	</th>	144	</th>
145	<th>	145	<th>
146	<input type="text" class="form-control" style="height:31px;" name="name" id="name">	146	<input type="text" class="form-control" style="height:31px;" name="name" id="name">
147	<label class="font-company">Primary Contact <i class="fa fa-sort" aria-hidden="true"></i></label>	147	<label class="font-company">Primary Contact <i class="fa fa-sort" aria-hidden="true"></i></label>
148	</th>	148	</th>
149		149
150	<th>	150	<th>
151	<input type="text" class="form-control" style="height:31px;" name="name" id="name">	151	<input type="text" class="form-control" style="height:31px;" name="name" id="name">
152	<label class="font-company">Status <i class="fa fa-sort" aria-hidden="true"></i></label>	152	<label class="font-company">Status <i class="fa fa-sort" aria-hidden="true"></i></label>
153	<th>	153	<th>
154	<input type="text" class="form-control" style="height:31px;" name="name" id="name">	154	<input type="text" class="form-control" style="height:31px;" name="name" id="name">
155	<label class="font-company">Source <i class="fa fa-sort" aria-hidden="true"></i></label>	155	<label class="font-company">Source <i class="fa fa-sort" aria-hidden="true"></i></label>
156	</th>	156	</th>
157	<th>	157	<th>
158	<input type="text" class="form-control" style="height:31px;" name="name" id="name">	158	<input type="text" class="form-control" style="height:31px;" name="name" id="name">
159	<label class="font-company">Margin Setting <i class="fa fa-sort" aria-hidden="true"></i></label>	159	<label class="font-company">Margin Setting <i class="fa fa-sort" aria-hidden="true"></i></label>
160	</th>	160	</th>
161	<th>	161	<th>
162	<input type="text" class="form-control" style="height:31px;" name="name" id="name">	162	<input type="text" class="form-control" style="height:31px;" name="name" id="name">
163	<label class="font-company">All In <i class="fa fa-sort" aria-hidden="true"></i></label>	163	<label class="font-company">All In <i class="fa fa-sort" aria-hidden="true"></i></label>
164	</th>	164	</th>
165	</tr>	165	</tr>
166	</thead>	166	</thead>
167	<tbody>	167	<tbody>
168	<tr ng-repeat="vendor in vendorList">	168	<tr ng-repeat="vendor in vendorList">
169	<td class="font-company">	169	<td class="font-company">
170	<a style="color: #333; text-decoration: none;" href="#!/viewFuelVendor/{{vendor.id}}">{{vendor.vendorName}}</a>	170	<a style="color: #333; text-decoration: none;" href="#!/viewFuelVendor/{{vendor.id}}">{{vendor.vendorName}}</a>
171	</td>	171	</td>
172	<td class="font-company">{{vendor.phone}}</td>	172	<td class="font-company">{{vendor.phone}}</td>
173	<td class="font-company">{{vendor.contact}}</td>	173	<td class="font-company">{{vendor.contact}}</td>
174	<td class="font-company">	174	<td class="font-company">
175	<button type="button" ng-if="vendor.activate == true" class="btn btn-success btn-xs">Active</button>	175	<button type="button" ng-if="vendor.activate == true" class="btn btn-success btn-xs">Active</button>
176	<button type="button" ng-if="vendor.activate == false" class="btn btn-warning btn-xs">InActive</button>	176	<button type="button" ng-if="vendor.activate == false" class="btn btn-warning btn-xs">InActive</button>
177	</td>	177	</td>
178	<td class="font-company">{{vendor.source}}</td>	178	<td class="font-company">{{vendor.source}}</td>
179	<td class="font-company">	179	<td class="font-company">
180	<select class="form-control" ng-blur="editMargin(vendor)" style="height:31px;" ng-model="vendor.masterMargin" ng-options="margin.id as margin.marginName for margin in marginList" required></select>	180	<select class="form-control" ng-blur="editMargin(vendor)" style="height:31px;" ng-model="vendor.masterMargin" ng-options="margin.id as margin.marginName for margin in marginList" required></select>
181		181
182	<select class="form-control" style="height:31px;">	182	<select class="form-control" style="height:31px;">
183	<option>Margin1</option>	183	<option>Margin1</option>
184	<option>Margin2</option>	184	<option>Margin2</option>
185	</select>	185	</select>
186	</td>	186	</td>
187	<td class="font-company">{{vendor.allIn}}</td>	187	<td class="font-company">{{vendor.allIn}}</td>
188	</tr>	188	</tr>
189	</tbody>	189	</tbody>
190	</table> -->	190	</table> -->
191	</div>	191	</div>
192	</div>	192	</div>
193	</div>	193	</div>
194	</div>	194	</div>
195	<!-- /widget-content -->	195	<!-- /widget-content -->
196	</div>	196	</div>
197	<!-- /widget -->	197	<!-- /widget -->
198	</div>	198	</div>
199	<!-- /span8 -->	199	<!-- /span8 -->
200	</div>	200	</div>
201	<!-- /row -->	201	<!-- /row -->
202	</div>	202	</div>
203	<!-- /container -->	203	<!-- /container -->
204	</div>	204	</div>
205	<!-- /main -->	205	<!-- /main -->
206		206
207	<form class="modal multi-step" id="vendor-modal-3" name="vendorForm">	207	<form class="modal multi-step" id="vendor-modal-3" name="vendorForm">
208	<div class="modal-dialog modal-lg">	208	<div class="modal-dialog modal-lg">
209	<div class="modal-content">	209	<div class="modal-content">
210	<div class="modal-body step-1" data-step="1" style="padding: 0;">	210	<div class="modal-body step-1" data-step="1" style="padding: 0;">
211	<div>	211	<div>
212	<div class="row" style="margin: 0;">	212	<div class="row" style="margin: 0;">
213	<div>	213	<div>
214	<div class="widget" style="margin-bottom: 0;">	214	<div class="widget" style="margin-bottom: 0;">
215	<div class="widget-header">	215	<div class="widget-header">
216	<i class="icon-pencil"></i>	216	<i class="icon-pencil"></i>
217	<i class="fa fa-tasks" aria-hidden="true"></i>	217	<i class="fa fa-tasks" aria-hidden="true"></i>
218	<h3>Add a New Vendor</h3>	218	<h3>Add a New Vendor</h3>
219	<div class="pull-right my-toggle-switch" style="margin-right: 30px;">	219	<div class="pull-right my-toggle-switch" style="margin-right: 30px;">
220	<div style="color: #ff9a01;">Activate &nbsp &nbsp	220	<div style="color: #ff9a01;">Activate &nbsp &nbsp
221	<toggle ng-model="data.activate" size="customToogle"></toggle>	221	<toggle ng-model="data.activate" size="customToogle"></toggle>
222	</div>	222	</div>
223	</div>	223	</div>
224	<div class="clearfix"></div>	224	<div class="clearfix"></div>
225	</div>	225	</div>
226	<div class="widget-content" style="padding-left: 0; padding-right: 0; border-bottom: 0;">	226	<div class="widget-content" style="padding-left: 0; padding-right: 0; border-bottom: 0;">
227	<div class="col-xs-12">	227	<div class="col-xs-12">
228	<div class="col-md-8">	228	<div class="col-md-8">
229	<div class="pull-left">	229	<div class="pull-left">
230	<label class="new-input-label"><b>Vendor Name</b></label>	230	<label class="new-input-label"><b>Vendor Name</b></label>
231	</div>	231	</div>
232	<div class="pull-left" style="margin-left: 15px;">	232	<div class="pull-left" style="margin-left: 15px;">
233	<input type="text" ng-model="data.vendorName" class="form-control companyNameInput" ng-keyup="removeValidation()" placeholder="" required>	233	<input type="text" ng-model="data.vendorName" class="form-control companyNameInput" ng-keyup="removeValidation()" placeholder="" required>
234	<label class="customErrorMessage" ng-show="showCompanyError">This field is required.</label>	234	<label class="customErrorMessage" ng-show="showCompanyError">This field is required.</label>
235	</div>	235	</div>
236	<div class="clearfix"></div>	236	<div class="clearfix"></div>
237	</div>	237	</div>
238	<div class="col-md-4">	238	<div class="col-md-4">
239	</div>	239	</div>
240	</div>	240	</div>
241	<div class="clearfix"></div><br>	241	<div class="clearfix"></div><br>
242	<br/>	242	<br/>
243	<div class="col-xs-12">	243	<div class="col-xs-12">
244	<div class="col-md-6">	244	<div class="col-md-6">
245	<div class="pull-left" style="width: 110px;">	245	<div class="pull-left" style="width: 110px;">
246	<b>JET A Margin</b>	246	<b>JET A Margin</b>
247	</div>	247	</div>
248	<div class="pull-left">	248	<div class="pull-left">
249	<select class="form-control marginSelectBox" ng-model="data.masterMargin" ng-options="margin.id as margin.marginName for margin in jetMarginList" required ng-change="removeMarginValidation()">	249	<select class="form-control marginSelectBox" ng-model="data.masterMargin" ng-options="margin.id as margin.marginName for margin in jetMarginList" required ng-change="removeMarginValidation()">
250	<option value="" disabled>Select...</option>	250	<option value="" disabled>Select...</option>
251	</select>	251	</select>
252	<label ng-show="showMarginError" class="customErrorMessage">This field is required.</label>	252	<label ng-show="showMarginError" class="customErrorMessage">This field is required.</label>
253	</div>	253	</div>
254	<div class="clearfix"></div>	254	<div class="clearfix"></div>
255	</div>	255	</div>
256		256
257	<div class="col-md-3 Airport" style="text-align: right;">	257	<div class="col-md-3 Airport" style="text-align: right;">
258	<b>AVGAS 100LL Margin</b>	258	<b>AVGAS 100LL Margin</b>
259	</div>	259	</div>
260	<div class="col-md-3 Airport">	260	<div class="col-md-3 Airport">
261	<select class="form-control" ng-model="data.avgasMargin" ng-options="avgs.id as avgs.marginName for avgs in avgsMarginList">	261	<select class="form-control" ng-model="data.avgasMargin" ng-options="avgs.id as avgs.marginName for avgs in avgsMarginList">
262	<option value="" disabled>Select...</option>	262	<option value="" disabled>Select...</option>
263	</select>	263	</select>
264	</div>	264	</div>
265	<div class="clearfix"></div>	265	<div class="clearfix"></div>
266	</div>	266	</div>
267	<div class="clearfix"></div>	267	<div class="clearfix"></div>
268	<br/>	268	<br/>
269	<div class="col-xs-12">	269	<div class="col-xs-12">
270	<div class="col-md-12">	270	<div class="col-md-12">
271	<div class="pull-left" style="width: 110px;">	271	<div class="pull-left" style="width: 110px;">
272	<label class="new-input-label"><b>Address</b></label>	272	<label class="new-input-label"><b>Address</b></label>
273	</div>	273	</div>
274	<div class="pull-left" style="width: calc(100% - 110px);">	274	<div class="pull-left" style="width: calc(100% - 110px);">
275	<input type="text" class="form-control" ng-model="data.addressOne" id="Address" placeholder="">	275	<input type="text" class="form-control" ng-model="data.addressOne" id="Address" placeholder="">
276	</div>	276	</div>
277	<div class="clearfix"></div>	277	<div class="clearfix"></div>
278	</div>	278	</div>
279	</div>	279	</div>
280	<div class="clearfix"></div>	280	<div class="clearfix"></div>
281	<br/>	281	<br/>
282	<div class="col-xs-12">	282	<div class="col-xs-12">
283	<div class="col-md-12">	283	<div class="col-md-12">
284	<div class="pull-left" style="width: 110px;">	284	<div class="pull-left" style="width: 110px;">
285	<label class="new-input-label"><b>Address2</b></label>	285	<label class="new-input-label"><b>Address2</b></label>
286	</div>	286	</div>
287	<div class="pull-left" style="width: calc(100% - 110px);">	287	<div class="pull-left" style="width: calc(100% - 110px);">
288	<input type="text" ng-model="data.addressTwo" class="form-control" id="Address" placeholder="">	288	<input type="text" ng-model="data.addressTwo" class="form-control" id="Address" placeholder="">
289	</div>	289	</div>
290	<div class="clearfix"></div>	290	<div class="clearfix"></div>
291	</div>	291	</div>
292	</div>	292	</div>
293	<div class="clearfix"></div>	293	<div class="clearfix"></div>
294	<br/>	294	<br/>
295	<div class="col-xs-12">	295	<div class="col-xs-12">
296		296
297	<div class="col-md-6">	297	<div class="col-md-6">
298	<div class="pull-left" style="width: 110px;">	298	<div class="pull-left" style="width: 110px;">
299	<label class="new-input-label"><b>City</b></label>	299	<label class="new-input-label"><b>City</b></label>
300	</div>	300	</div>
301	<div class="pull-left" style="width: calc(100% - 110px);">	301	<div class="pull-left" style="width: calc(100% - 110px);">
302	<input type="text" ng-model="data.city" class="form-control" id="Address" placeholder="">	302	<input type="text" ng-model="data.city" class="form-control" id="Address" placeholder="">
303	</div>	303	</div>
304	<div class="clearfix"></div>	304	<div class="clearfix"></div>
305	</div>	305	</div>
306	<div class="col-md-3">	306	<div class="col-md-3">
307	<div class="pull-left" style="width: 40px;">	307	<div class="pull-left" style="width: 40px;">
308	<label class="new-input-label"><b>State</b></label>	308	<label class="new-input-label"><b>State</b></label>
309	</div>	309	</div>
310	<div class="pull-left" style="width: calc(100% - 110px);">	310	<div class="pull-left" style="width: calc(100% - 110px);">
311	<input type="text" ng-model="data.state" class="form-control" id="Address" placeholder="">	311	<input type="text" ng-model="data.state" class="form-control" id="Address" placeholder="">
312	</div>	312	</div>
313	<div class="clearfix"></div>	313	<div class="clearfix"></div>
314	</div>	314	</div>
315	<div class="col-md-3">	315	<div class="col-md-3">
316	<div class="pull-left">	316	<div class="pull-left">
317	<label class="new-input-label"><b>Zip Code</b></label>	317	<label class="new-input-label"><b>Zip Code</b></label>
318	</div>	318	</div>
319	<div class="pull-right" style="width: calc(100% - 60px);">	319	<div class="pull-right" style="width: calc(100% - 60px);">
320	<input type="tel" ng-model="data.zipcode" class="form-control" id="Address" placeholder="">	320	<input type="tel" ng-model="data.zipcode" class="form-control" id="Address" placeholder="">
321	</div>	321	</div>
322	<div class="clearfix"></div>	322	<div class="clearfix"></div>
323	</div>	323	</div>
324	</div>	324	</div>
325	<div class="clearfix"></div>	325	<div class="clearfix"></div>
326	<br/>	326	<br/>
327	<div class="col-xs-12">	327	<div class="col-xs-12">
328		328
329	<div class="col-md-6">	329	<div class="col-md-6">
330	<div class="pull-left" style="width: 110px;">	330	<div class="pull-left" style="width: 110px;">
331	<label class="new-input-label"><b>Country</b></label>	331	<label class="new-input-label"><b>Country</b></label>
332	</div>	332	</div>
333	<div class="pull-left" style="width: calc(100% - 110px);">	333	<div class="pull-left" style="width: calc(100% - 110px);">
334	<input type="text" ng-model="data.country" class="form-control" id="Address" placeholder="">	334	<input type="text" ng-model="data.country" class="form-control" id="Address" placeholder="">
335	</div>	335	</div>
336	<div class="clearfix"></div>	336	<div class="clearfix"></div>
337	</div>	337	</div>
338	<div class="col-md-6">	338	<div class="col-md-6">
339	<div class="pull-left" style="width: 110px;">	339	<div class="pull-left" style="width: 110px;">
340	<label class="new-input-label"><b>Internal Note</b></label>	340	<label class="new-input-label"><b>Internal Note</b></label>
341	</div>	341	</div>
342	<div class="pull-left" style="width: calc(100% - 110px);">	342	<div class="pull-left" style="width: calc(100% - 110px);">
343	<textarea name="message" ng-model="data.internalNote" rows="4" cols="34"></textarea>	343	<textarea name="message" ng-model="data.internalNote" rows="4" cols="34"></textarea>
344	</div>	344	</div>
345	<div class="clearfix"></div>	345	<div class="clearfix"></div>
346	</div>	346	</div>
347	</div>	347	</div>
348	<div class="clearfix"></div>	348	<div class="clearfix"></div>
349	</div>	349	</div>
350	</div>	350	</div>
351	<div class="clearfix"></div>	351	<div class="clearfix"></div>
352	</div>	352	</div>
353	</div>	353	</div>
354	</div>	354	</div>
355	</div>	355	</div>
356	<div class="modal-footer" style="border-top: 0;">	356	<div class="modal-footer" style="border-top: 0;">
357	<button type="button" class="btn btn-default" ng-click="reset()" data-dismiss="modal">Cancel</button>	357	<button type="button" class="btn btn-default" ng-click="reset()" data-dismiss="modal">Cancel</button>
358	<button type="button" class="btn btn-primary step step-1" data-step="1" ng-click="addFirstData()">Save</button>	358	<button type="button" class="btn btn-primary step step-1" data-step="1" ng-click="addFirstData()">Save</button>
359	</div>	359	</div>
360	</div>	360	</div>
361	</div>	361	</div>
362	</form>	362	</form>
363	<div class="myLoader" ng-show="showLoader">	363	<div class="myLoader" ng-show="showLoader">
364	<img src="../img/hourglass.gif" width="50px;">	364	<img src="../img/hourglass.gif" width="50px;">
365	</div>	365	</div>
366	<script src="js/multi-step-modal.js"></script>	366	<script src="js/multi-step-modal.js"></script>
367	<script>	367	<script>
368	sendEvent = function(sel, step) {	368	sendEvent = function(sel, step) {
369	$(sel).trigger('next.m.' + step);	369	$(sel).trigger('next.m.' + step);
370	}	370	}
371	</script>	371	</script>

app/partials/customers/customers.html

Diff comments View file @8f7dbe9

 <style>
    .subnavbar .mainnav > li:nth-child(3) > a{
    color: #ff9900;
    }
    .button1 {
      display: inline-block;
      height: 35px;
      line-height: 35px;
      padding-right: 15px;
      padding-left: 50px;
      position: relative;
      background-color:rgb(41,127,184);
      color:rgb(255,255,255);
      text-decoration: none;
      text-transform: uppercase;
      letter-spacing: 1px;
      margin-bottom: 15px;
      border: 0;
         border-radius: 5px;
         -moz-border-radius: 5px;
         -webkit-border-radius: 5px;
         text-shadow:0px 1px 0px rgba(0,0,0,0.5);
       -ms-filter:"progid:DXImageTransform.Microsoft.dropshadow(OffX=0,OffY=1,Color=#ff123852,Positive=true)";zoom:1;
       filter:progid:DXImageTransform.Microsoft.dropshadow(OffX=0,OffY=1,Color=#ff123852,Positive=true);
         -moz-box-shadow:0px 2px 2px rgba(0,0,0,0.2);
         -webkit-box-shadow:0px 2px 2px rgba(0,0,0,0.2);
         box-shadow:0px 2px 2px rgba(0,0,0,0.2);
         -ms-filter:"progid:DXImageTransform.Microsoft.dropshadow(OffX=0,OffY=2,Color=#33000000,Positive=true)";
       filter:progid:DXImageTransform.Microsoft.dropshadow(OffX=0,OffY=2,Color=#33000000,Positive=true);
    }
    .button1 span {
      position: absolute;
      left: 0;
      top: 0;
      width: 35px;
      background-color:rgba(0,0,0,0.5);
      -webkit-border-top-left-radius: 5px;
    -webkit-border-bottom-left-radius: 5px;
    -moz-border-radius-topleft: 5px;
    -moz-border-radius-bottomleft: 5px;
    border-top-left-radius: 5px;
    border-bottom-left-radius: 5px;
    border-right: 1px solid  rgba(0,0,0,0.15);
    }
    .button1:hover span, .button1.active span {
      background-color:rgb(0,102,26);
      border-right: 1px solid  rgba(0,0,0,0.3);
    }
    .button1:active {
      margin-top: 2px;
      margin-bottom: 13px;
      -moz-box-shadow:0px 1px 0px rgba(255,255,255,0.5);
    -webkit-box-shadow:0px 1px 0px rgba(255,255,255,0.5);
    box-shadow:0px 1px 0px rgba(255,255,255,0.5);
    -ms-filter:"progid:DXImageTransform.Microsoft.dropshadow(OffX=0,OffY=1,Color=#ccffffff,Positive=true)";
    filter:progid:DXImageTransform.Microsoft.dropshadow(OffX=0,OffY=1,Color=#ccffffff,Positive=true);
    }
    .button1.turquoise {
      background: #449d44;
    }
 </style>
 <div class="main">
    <div class="container">
       <div class="row">
          <div class="col-md-12">
             <div class="widget stacked ">
                <div class="widget-content">
                   <div class="tabbable">
                      <ul class="nav nav-tabs">
                         <li class="active">
                            <a ui-sref="app.customers">Company View
                               <i class="fa fa-caret-down" aria-hidden="true"></i>
                            </a>
                         </li>
                         <li>
                            <a ui-sref="app.ContactView">Contact View
                               <i class="fa fa-caret-down" aria-hidden="true"></i>
                            </a>
                         </li>
                         <li>
                            <a ui-sref="app.FuelVendors">Fuel Vendors
                               <i class="fa fa-caret-down" aria-hidden="true"></i>
                            </a>
                         </li>
                         <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>
                         <li><button type="button" class="btn btn-default btn-sm">Clear Search And Filters</button></li>
                         <li style="float:right"><button type="submit"  data-toggle="modal" data-target="#demo-modal-3" class="btn btn-success btn-sm"><i class="fa fa-plus" aria-hidden="true"></i> Add Company</button></li>
                      </ul>
                      <br>
                      <div class="tab-content customer-table" style="margin:0px">
                         <div class="tab-pane active" id="companyView">
                           <table ng-table="displayCompanyList" class="table table-striped table-condensed" show-filter="true">
                            <tr ng-repeat="row in $data track by row.id" style="cursor: pointer;" ui-sref="app.viewCompany({id : row.id})">
                              <td data-title="'Company Name'" filter="{companyName: 'text'}" sortable="'companyName'">
                               {{row.companyName}}
                              </td>
                              <td data-title="'Fleet'" filter="{companyAircraftSize: 'text'}" sortable="'companyAircraftSize'">
                               {{row.companyAircraftSize}}
                              </td>
                              <td data-title="'Main Phone'" filter="{newContactNumber: 'text'}" sortable="'newContactNumber'">
                               {{row.newContactNumber}}
                              </td>
                              <td data-title="'Primary Contact'" filter="{primaryContactName: 'text'}" sortable="'primaryContactName'">
                               {{row.primaryContactName}}
                              </td>
                              <td data-title="'Base'" filter="{baseIcao: 'text'}" sortable="'baseIcao'">
                               {{row.baseIcao}}
                              </td>
                              <td data-title="'Status'" filter="{activate: 'select'}" filter-data="statusFilter" sortable="'activate'">
                               <button type="button" ng-if="row.activate == true" class="btn btn-success btn-xs">Active</button>
                               <button type="button" ng-if="row.activate == false" class="btn btn-warning btn-xs">InActive</button>
                              </td>
                              <td data-title="'Margin Setting'" filter="{masterMargin: 'select'}" filter-data="marginFilterOptions" sortable="'masterMargin'">
                               <select class="form-control" ng-change="editMargin(row)" style="height:31px;" ng-model="row.masterMargin" ng-selected="" ng-options="margin.id as margin.marginName for margin in jetMarginList" required></select>
                              </td>
                              <td data-title="'All In'" filter="{allIn: 'text'}" sortable="'allIn'">
                               {{row.allIn}}
                              </td>
                              <td data-title="''">
                               <button type="button" class="btn btn-info btn-xs" ng-click="setFuel()">Setup Fuel</button>
                              </td>
                            </tr>
                          </table>
+                         <button type="button" class="btn btn-warning exportBtn">Export Customers</button>
                         <!--
                            <table class="table table-striped">
                               <thead>
                                  <tr>
                                     <th>
                                        <input type="text" class="form-control" name="name" id="name">
                                        <label class="font-company">Company Name <i class="fa fa-sort" aria-hidden="true"></i></label>
                                     </th>
                                     <th>
                                        <input type="text" class="form-control" name="name" id="name">
                                        <label class="font-company">Fleet <i class="fa fa-sort" aria-hidden="true"></i></label>
                                     </th>
                                     <th>
                                        <input type="text" class="form-control" name="name" id="name">
                                        <label class="font-company">Main Phone <i class="fa fa-sort" aria-hidden="true"></i></label>
                                     </th>
                                     <th>
                                        <input type="text" class="form-control" name="name" id="name">
                                        <label class="font-company">Primary Contact <i class="fa fa-sort" aria-hidden="true"></i></label>
                                     </th>
                                     <th>
                                        <input type="text" class="form-control" name="name" id="name">
                                        <label class="font-company">Base <i class="fa fa-sort" aria-hidden="true"></i></label>
                                     </th>
                                     <th>
                                        <select class="form-control">
                                           <option value="showAll" selected>Show All</option>
                                        </select>
                                        <label class="font-company">Status <i class="fa fa-sort" aria-hidden="true"></i></label>
                                     </th>
                                     <th>
                                        <select class="form-control">
                                           <option value="showAll" selected>Show All</option>
                                        </select>
                                        <label class="font-company">Margin Setting <i class="fa fa-sort" aria-hidden="true"></i></label>
                                     </th>
                                     <th>
                                        <input type="text" class="form-control"  name="name" id="name">
                                        <label class="font-company">All In <i class="fa fa-sort" aria-hidden="true"></i></label>
                                     </th>
                                     <th> &nbsp; </th>
                               </thead>
                               <tbody>
                                  <tr ng-repeat="customer in companyList" style="cursor: pointer;" ui-sref="app.viewCompany({id : customer.id})">
                                     <td class="font-company">
                                       {{customer.companyName}}
                                     </td>
                                     <td class="font-company">{{customer.companyAircraftSize}}</td>
                                     <td class="font-company">{{customer.companyCustomContacts[0].contactNumber}}</td>
                                     <td class="font-company">{{customer.companyPrimaryContacts[0].firstName}} {{customer.companyPrimaryContacts[0].lastName}}</td>
                                     <td class="font-company">{{customer.baseIcao}}</td>
                                     <td class="font-company">
                                        <button type="button" ng-if="customer.activate == true" class="btn btn-success btn-xs">Active</button>
                                        <button type="button" ng-if="customer.activate == false" class="btn btn-warning btn-xs">InActive</button>
                                     </td>
                                     <td class="font-company">
                                       <select class="form-control" ng-click="editMargin(customer)" style="height:31px;" ng-model="customer.masterMargin" ng-options="margin.id as margin.marginName for margin in marginList" required></select>
                                     </td>
                                     <td class="font-company">{{customer.allIn}}</td>
                                     <td>
                                        <button type="button" class="btn btn-info btn-xs" ng-click="setFuel()">Setup Fuel</button>
                                     </td>
                                  </tr>
                               </tbody>
                            </table>
                            <div class="row" style="margin-left: 0px;">
                               <div class="col-md-2">
                                  <button type="button" class="btn btn-warning">Export Customers</button>
                               </div>
                               <div class="col-md-10">
                                  <div class="row" style="margin-left: 0px;">
                                     <div class="col-md-6">
                                     </div>
                                     <div class="col-md-2">
                                        <select class="form-control">
                                           <option>20 Records Per Page</option>
                                           <option>50 Records Per Page</option>
                                           <option>100 Records Per Page</option>
                                        </select>
                                     </div>
                                     <div class="col-md-4">
                                        <ul class="pagination" style="margin:0px">
                                           <li><a href="javascript:;">«</a></li>
                                           <li class="active"><a href="#">1</a></li>
                                           <li><a href="javascript:;">2</a></li>
                                           <li><a href="javascript:;">3</a></li>
                                           <li><a href="javascript:;">4</a></li>
                                           <li><a href="javascript:;">5</a></li>
                                           <li><a href="javascript:;">»</a></li>
                                        </ul>
                                     </div>
                                  </div>
                               </div>
                            </div>
                          --></div>
                      </div>
                   </div>
                </div>
                <!-- /widget-content -->
             </div>
             <!-- /widget -->
          </div>
          <!-- /span8 -->
       </div>
       <!-- /row -->
    </div>
    <!-- /container -->
 </div>
 <!-- /main -->
 <form class="modal multi-step" id="demo-modal-3" name="companyForm">
     <div class="modal-dialog modal-lg">
         <div class="modal-content">
             <div class="modal-body step-1" data-step="1" style="padding: 0;">
                <div>
                   <div class="row" style="margin: 0;">
                      <div>
                         <div class="widget" style="margin-bottom: 0;">
                            <div class="widget-header">
                               <i class="icon-pencil"></i>
                               <i class="fa fa-tasks" aria-hidden="true"></i>
                               <h3>Add a New Company</h3>
                               <div class="pull-right my-toggle-switch" style="margin-right: 30px;">
                                  <div style="color: #ff9a01;">Activate &nbsp &nbsp
                                     <toggle ng-model="data.activate" size="customToogle"></toggle>
                                  </div>
                               </div>
                               <div class="clearfix"></div>
                            </div>
                            <div class="widget-content" style="padding-left: 0; padding-right: 0; border-bottom: 0;">
                               <div class="col-xs-12">
                                  <div class="col-md-8">
                                     <div class="pull-left">
                                        <label class="new-input-label"><b>Company Name *</b></label>
                                     </div>
                                     <div class="pull-left" style="margin-left: 15px;">
                                        <input type="text" ng-model="data.companyName" class="form-control companyNameInput" ng-keyup="removeValidation()" placeholder="" required>
                                        <label class="customErrorMessage" ng-show="showCompanyError">This field is required.</label>
                                     </div>
                                     <div class="clearfix"></div>
                                  </div>
                                  <div class="col-md-4">
                                     <div class="pull-right">
                                        <input type="text" ng-model="data.baseIcao" style="width: 100px;" class="form-control"  placeholder="">
                                     </div>
                                     <div class="pull-right">
                                        <label style="margin-right: 15px;" class="new-input-label"><b>Base ICAO</b></label>
                                     </div>
                                     <div class="clearfix"></div>
                                  </div>
                               </div>
                               <div class="clearfix"></div><br>
                               <div class="col-xs-12">
                                  <div class="col-md-7">
                                     <div class="pull-left">
                                        <label class="new-input-label"><b>Relationship&nbsp;</b></label>
                                     </div>
                                     <div class="pull-left" style="margin-left: 32px;">
                                        <input type="checkbox" ng-model="data.baseTenant" name="vehicle" value="Bike"> Check here if this is a Base Tenant<br>
                                        <input type="checkbox" ng-model="data.fuelerlinxCustomer" name="vehicle" value="Car" checked> Check here if this is a FuelerLinx Customer<br>
                                        <input type="checkbox" ng-model="data.contractFuelVendor" name="vehicle" value="Car" checked> Check here if this is a Contract Fuel Vendor
                                     </div>
                                     <div class="clearfix"></div>
                                  </div>
                                  <div class="col-md-2 Airport" style="text-align: right;">
                                     <b>Certificate Type</b>
                                  </div>
                                  <div class="col-md-3 Airport">
                                     <select required class="form-control" ng-model="data.certificateType">
                                        <option value="" disabled selected hidden>Select...</option>
                                        <option value="corporate">Part 91 (Corporate)</option>
                                        <option value="charter">Part 135 (Charter)</option>
                                        <option value="scheduled">Part 121 (Scheduled)</option>
                                        <option value="military">Military</option>
                                        <option value="government">Government</option>
                                     </select>
                                  </div>
                                  <div class="clearfix"></div>
                               </div>
                               <div class="clearfix"></div>
                               <br/>
                               <div class="col-xs-12">
                                  <div class="col-md-6">
                                     <div class="pull-left" style="width: 110px;">
                                        <b>JET A Margin *</b>
                                     </div>
                                     <div class="pull-left">
                                       <select class="form-control marginSelectBox" ng-model="data.masterMargin" ng-options="margin.id as margin.marginName for margin in jetMarginList" required ng-change="removeMarginValidation()">
                                        <option value="" disabled>Select...</option>
                                       </select>
                                       <label ng-show="showMarginError" class="customErrorMessage">This field is required.</label>
                                       <div class="clearfix"></div>
                                     </div>
                                   </div>
                                  <div class="col-md-3 Airport" style="text-align: right;">
                                     <b>AVGAS 100LL Margin</b>
                                  </div>
                                  <div class="col-md-3 Airport">
                                     <select class="form-control" ng-model="data.avgasMargin" ng-options="avgs.id as avgs.marginName for avgs in avgsMarginList">
                                     <option value="" disabled>Select...</option>
                                     </select>
                                  </div>
                                  <div class="clearfix"></div>
                               </div>
                               <div class="clearfix"></div>
                               <br/>
                               <div class="col-xs-12">
                                   <div class="col-md-12">
                                     <div class="pull-left" style="width: 110px;">
                                        <label class="new-input-label"><b>Address</b></label>
                                     </div>
                                     <div class="pull-left" style="width: calc(100% - 110px);">
                                        <input type="text" class="form-control" ng-model="data.addressOne"  placeholder="">
                                     </div>
                                     <div class="clearfix"></div>
                                  </div>
                               </div>
                               <div class="clearfix"></div>
                               <br/>
                               <div class="col-xs-12">
                                   <div class="col-md-12">
                                     <div class="pull-left" style="width: 110px;">
                                        <label class="new-input-label"><b>Address2</b></label>
                                     </div>
                                     <div class="pull-left" style="width: calc(100% - 110px);">
                                        <input type="text" ng-model="data.addressTwo" class="form-control"  placeholder="">
                                     </div>
                                     <div class="clearfix"></div>
                                  </div>
                               </div>
                               <div class="clearfix"></div>
                               <br/>
                               <div class="col-xs-12">
                                  <div class="col-md-6">
                                     <div class="pull-left" style="width: 110px;">
                                        <label class="new-input-label"><b>City</b></label>
                                     </div>
                                     <div class="pull-left" style="width: calc(100% - 110px);">
                                        <input type="text" ng-model="data.city" class="form-control"  placeholder="">
                                     </div>
                                     <div class="clearfix"></div>
                                  </div>
                                  <div class="col-md-3">
                                     <div class="pull-left" style="width: 40px;">
                                        <label class="new-input-label"><b>State</b></label>
                                     </div>
                                     <div class="pull-left" style="width: calc(100% - 110px);">
                                        <input type="text" ng-model="data.state" class="form-control"  placeholder="">
                                     </div>
                                     <div class="clearfix"></div>
                                  </div>
                                  <div class="col-md-3">
                                     <div class="pull-left">
                                        <label class="new-input-label"><b>Zip Code</b></label>
                                     </div>
                                     <div class="pull-right" style="width: calc(100% - 60px);">
                                        <input type="tel" ng-model="data.zipcode" class="form-control"  placeholder="">
                                     </div>
                                     <div class="clearfix"></div>
                                  </div>
                               </div>
                               <div class="clearfix"></div>
                               <br/>
                               <div class="col-xs-12">
                                  <div class="col-md-6">
                                     <div class="pull-left" style="width: 110px;">
                                        <label class="new-input-label"><b>Country</b></label>
                                     </div>
                                     <div class="pull-left" style="width: calc(100% - 110px);">
                                        <input type="text" ng-model="data.country" class="form-control"  placeholder="">
                                     </div>
                                     <div class="clearfix"></div>
                                  </div>
                                  <div class="col-md-6">
                                     <div class="pull-left" style="width: 110px;">
                                        <label class="new-input-label"><b>Internal Note</b></label>
                                     </div>
                                     <div class="pull-left" style="width: calc(100% - 110px);">
                                        <textarea  name="message" ng-model="data.internalNote" rows="4" cols="34"></textarea>
                                     </div>
                                     <div class="clearfix"></div>
                                  </div>
                               </div>
                               <div class="clearfix"></div>
                              <!--  <br/>
                               <div class="col-xs-12">
                                  <div class="col-md-2 Airport"></div>
                                  <div class="col-md-10 Airport">
                                     <div class="pull-right">
                                        <button type="button" class="btn btn-default" ng-click="cancel()">Cancel</button>
                                        <button type="button" class="btn btn-warning" ng-click="addAircraft()">Next: Add Aircraft</button>
                                     </div>
                                  </div>
                               </div> -->
                            </div>
                         </div>
                         <div class="clearfix"></div>
                      </div>
                   </div>
                </div>
             </div>
             <div class="modal-body step-2" data-step="2" style="padding: 0;">
                <div>
                   <div class="row" style="margin: 0;">
                      <div>
                         <div class="widget" style="margin-bottom: 0;">
                            <div class="widget-header">
                               <i class="icon-pencil"></i>
                               <i class="fa fa-tasks" aria-hidden="true"></i>
                               <h3>Add a New Company</h3>
                               <div class="clearfix"></div>
                            </div>
                            <div class="widget-content" style="padding-left: 0; padding-right: 0; border-bottom: 0;">
                               <div class="col-xs-12">
                                  <div class="widget-header">
                                     <i class="fa fa-list"></i>
                                     <h3>Aircraft List</h3>
                                  </div>
                                  <div class="widget-content" style="padding:0px;border: 0px; ">
                                     <div class="table-responsive">
                                        <!-- <table class="table table-bordered table-hover table-striped addRow" style="margin-bottom: 0px;">
                                           <thead>
                                              <tr>
                                                 <th>Tail</th>
                                                 <th>Make</th>
                                                 <th>Model</th>
                                                 <th>Size</th>
                                                 <th>Margin</th>
                                              </tr>
                                           </thead>
                                           <tbody>
                                              <tr>
                                                 <td>
                                                    <input type="text" style="width:100px;" ng-model="aircraft.tail" class="form-control">
                                                 </td>
                                                 <td style="width: 25%;">
                                                    <select class="form-control" ng-model="aircraft.make" ng-change="getModal()">
                                                       <option ng-repeat="make in aircraftMakeList">{{make}}</option>
                                                    </select>
                                                 </td>
                                                 <td style="width: 20%;">
                                                    <select class="form-control" ng-model="aircraft.model" ng-change="getSize()">
                                                       <option ng-repeat="model in aircraftModalList">{{model}}</option>
                                                    </select>
                                                 </td>
                                                 <td style="width: 25%;">
                                                    <select class="form-control" ng-model="aircraft.size">
                                                       <option ng-repeat="size in aircraftSizeList">{{size}}</option>
                                                    </select>
                                                 </td>
                                                 <td>
                                                    <select class="form-control">
                                                       <option>Margin1</option>
                                                       <option>Margin2</option>
                                                    </select>
                                                 </td>
                                              </tr>
                                           </tbody>
                                        </table> -->
                                       <table class="table table-striped table-bordered">
                                         <thead>
                                             <tr>
                                                 <!-- <th><input type="checkbox" ng-model="selectedAll" ng-click="checkAll()" /></th> -->
                                                 <th>Tail</th>
                                                 <th>Make</th>
                                                 <th>Model</th>
                                                 <th>Size</th>
                                                 <th>JET A Margin</th>
                                                 <th>AVGS 100LL Margin</th>
                                             </tr>
                                         </thead>
                                         <tbody>
                                             <tr ng-repeat="aircraftData in aircraftDetails track by $index">
                                                 <!-- <td>
                                                     <input type="checkbox" ng-model="aircraftData.selected"/>
                                                 </td> -->
                                                 <td style="width: 15%">
                                                     <input type="text" class="form-control" ng-model="aircraftData.tail" required/>
                                                 </td>
                                                 <td style="width: 17%">
                                                     <select class="form-control" ng-model="aircraftData.make" ng-change="getModal(aircraftData.make, $index)">
                                                       <option ng-repeat="make in aircraftMakeList">{{make}}</option>
                                                       <option value="" disabled>Select...</option>
                                                     </select>
                                                 </td>
                                                 <td style="width: 17%">
                                                     <select class="form-control" ng-model="aircraftData.model" ng-change="getSize(aircraftData.model, $index)">
                                                         <option ng-repeat="model in aircraftData.aircraftModalList">{{model}}</option>
                                                         <option value="" disabled>Select...</option>
                                                     </select>
                                                 </td>
                                                 <td style="width: 17%">
                                                   <select class="form-control" ng-model="aircraftData.sizeId" ng-options="size.aircraftSize.id as size.aircraftSize.size for size in aircraftData.aircraftSizeList">
                                                     <option value="" disabled>Select...</option>
                                                   </select>
                                                     <!-- <select class="form-control" ng-model="aircraftData.size">
                                                       <option ng-repeat="size in aircraftData.aircraftSizeList">{{size}}</option>
                                                     </select> -->
                                                 </td>
                                                 <td style="width: 17%">
                                                   <select class="form-control" ng-model="aircraftData.marginId" ng-options="margin.id as margin.marginName for margin in jetMarginList">
                                                     <option value="" disabled>Select...</option>
                                                   </select>
                                                 </td>
                                                 <td style="width: 17%">
                                                  <select class="form-control marginSelectBox" ng-model="aircraftData.avgasMarginId" ng-options="avgs.id as avgs.marginName for avgs in avgsMarginList">
                                                     <option value="" disabled>Select...</option>
                                                   </select>
                                                 </td>
                                             </tr>
                                           </tbody>
                                       </table>
                                     </div>
                                     <div class="clearfix"></div>
                                  </div>
                               </div>
                               <div class="clearfix"></div>
                               <div class="col-xs-12" style="margin-bottom: 50px;margin-top: 10px;">
                                  <button ng-click="addNew()" class="button1 turquoise pull-right"><span>+</span>Add Aircraft</button>
                               </div>
                               <!-- <div class="col-xs-12" style="margin-bottom: 20px;">
                                  <div class="pull-right">
                                     <button type="button" class="btn btn-default" ng-click="cancelCraft()">Cancel</button>
                                     <button type="button" class="btn btn-warning" ng-click="goBack()">Go Back</button>
                                     <button type="button" class="btn btn-success" ng-click="goBack()">Save</button>
                                  </div>
                               </div> -->
                            </div>
                         </div>
                         <div class="clearfix"></div>
                      </div>
                   </div>
                </div>
             </div>
             <!-- <div class="modal-body step-3" data-step="3">
                 This is the final step.
             </div> -->
             <div class="modal-footer" style="border-top: 0;">
                 <button type="button" class="btn btn-default" ng-click="reset2()" data-dismiss="modal">Cancel</button>
                 <button type="button" class="btn btn-primary step step-1" data-step="1" ng-click="addFirstData('#demo-modal-3', 2)">Next: Add Aircraft</button>
                 <button type="button" class="btn btn-primary step step-2" data-step="2" onclick="sendEvent('#demo-modal-3', 1)">Go Back</button>
                 <!-- <button type="button" class="btn btn-primary step step-2" data-step="2" onclick="sendEvent('#demo-modal-3', 3)">Continue</button> -->
                 <button type="button" class="btn btn-success step step-2" data-step="2" ng-click="saveCompanyData()">Save</button>
             </div>
         </div>
     </div>
 </form>
 <div class="myLoader" ng-show="showLoader">
    <img src="../img/hourglass.gif" width="50px;">
 </div>
 <script src="js/multi-step-modal.js"></script>
 <script>
 sendEvent = function(sel, step) {
     $(sel).trigger('next.m.' + step);
 }
 </script>

app/partials/enterFuelOrder/enterFuelOrder.controller.js

Diff comments View file @8f7dbe9

File was created	1	'use strict';
	2
	3	angular.module('acufuel')
	4
	5	.controller('enterFuelOrderController', ['$scope', '$rootScope', '$uibModal', '$filter', '$http', 'enterFuelOrderService', enterFuelOrderController]);
	6
	7	function enterFuelOrderController($scope, $rootScope, $uibModal, $filter, $http, enterFuelOrderService) {
	8	$scope.showLoader = true;
	9
	10	$scope.companyList = {};
	11
	12	enterFuelOrderService.getAllCompanies().then(function(result) {
	13	$scope.showLoader = false;
	14	$scope.companyList = result;
	15	})
	16
	17	$scope.order = {};
	18	$scope.order.upliftDate = '';
	19	$scope.order.departingDate = '';
	20	$scope.selectedCompanyName = '';
	21	$scope.selectedCompanyId = '';
	22	$scope.marginId = '';
	23
	24	enterFuelOrderService.getFuelPricingNew().then(function(margins) {
	25	$scope.marginList = margins;
	26	//console.log('$scope.marginList', $scope.marginList);
	27	})
	28
	29	$scope.getAircraft = function(company){
	30	$scope.selectedCompanyName = company;
	31	$scope.showLoader = true;
	32	for (var i = 0; i < $scope.companyList.length; i++) {
	33	if ($scope.companyList[i].companyName == company) {
	34	$scope.selectedCompanyId = $scope.companyList[i].id;
	35	$scope.marginId = $scope.companyList[i].margin.id;
	36	if ($scope.selectedCompanyId != '') {
	37	enterFuelOrderService.getAircraft($scope.selectedCompanyId).then(function(aircraft) {
	38	$scope.aircraftList = aircraft;
	39	})
	40	}
	41	if ($scope.marginId != '') {
	42	enterFuelOrderService.getJetTiers($scope.marginId).then(function(tiers) {
	43	$scope.tierList = tiers;
	44	$scope.showLoader = false;
	45	})
	46	}else{
	47	$scope.showLoader = false;
	48	}
	49	}
	50	}
	51
	52	}
	53
	54	$scope.dispatchFuel = function(){
	55	console.log('$scope.order', $scope.order);
	56	$scope.order.companyId = $scope.selectedCompanyId;
	57	if ($scope.order.upliftDate != '') {
	58	$scope.order.upliftDate = new Date($scope.order.upliftDate);
	59	$scope.order.upliftDate = $scope.order.upliftDate.getTime();
	60	}
	61	if ($scope.order.departingDate != '') {
	62	$scope.order.departingDate = new Date($scope.order.departingDate);
	63	$scope.order.departingDate = $scope.order.departingDate.getTime();
	64	}
	65	enterFuelOrderService.dispathFuelOrder($scope.order).then(function(result) {
	66	console.log('result', result);
	67	})
	68	}
	69
	70	}

app/partials/enterFuelOrder/enterFuelOrder.html

Diff comments View file @8f7dbe9

File was created	1	<style type="text/css">
	2	.subnavbar .mainnav > li:nth-child(2) > a{
	3	color: #ff9900;
	4	}
	5	.customInputWrap{
	6	margin-top: 15px;
	7	}
	8	.customInputWrap label{
	9	font-weight: normal;
	10	margin-bottom: 0;
	11	}
	12	</style>
	13	<div class="myLoader" ng-show="showLoader">
	14	<img src="../img/hourglass.gif" width="50px;">
	15	</div>
	16
	17	<div class="container">
	18	<div class="row">
	19	<div class="col-md-5">
	20	<div class="widget stacked">
	21	<div class="widget-header">
	22	<i class="fa fa-search" aria-hidden="true"></i>
	23	<h3>Search and Dispatch Fuel</h3>
	24	</div>
	25	<div class="widget-content new-widget-content">
	26	<form>
	27
	28	<div class="customInputWrap">
	29	<div class="col-md-3 text-right">
	30	<label>Company</label>
	31	</div>
	32	<div class="col-md-9">
	33	<select ui-select2 ng-model="order.companyName" ng-change="getAircraft(order.companyName)" style="width: 100%;">
	34	<option value="" selected disabled>Select Company</option>
	35	<option ng-repeat="list in companyList">{{list.companyName}}</option>
	36	</select>
	37	</div>
	38	<div class="clearfix"></div>
	39	</div>
	40
	41	<div class="customInputWrap">
	42	<div class="col-md-3 text-right">
	43	<label>Aircraft</label>
	44	</div>
	45	<div class="col-md-3">
	46	<select class="form-control" ng-model="order.aircraftName">
	47	<option selected disabled value="">Select Aircraft</option>
	48	<option ng-repeat="list in aircraftList" value="{{list.tail}}">{{list.tail}}</option>
	49	</select>
	50	</div>
	51	<div class="col-md-3 text-right">
	52	<label>Requested Volume</label>
	53	</div>
	54	<div class="col-md-3">
	55	<input type="text" ng-model="order.volume" class="form-control">
	56	</div>
	57	<div class="clearfix"></div>
	58	</div>
	59
	60	<div class="customInputWrap">
	61	<div class="col-md-3 text-right">
	62	<label>Price Quote</label>
	63	</div>
	64	<div class="col-md-8 col-md-offset-1">
	65	<select class="form-control" ng-model="order.priceQuote">
	66	<option value="" selected disabled>Select Price Quote</option>
	67	<option ng-repeat="margin in marginList" value="{{margin.fuelPricing.papTotal}}">${{margin.fuelPricing.papTotal}} {{margin.name}}</option>
	68	</select>
	69	</div>
	70	<div class="clearfix"></div>
	71	</div>
	72
	73	<div class="customInputWrap">
	74	<div class="col-md-3 text-right">
	75	<label>Tier Break</label>
	76	</div>
	77	<div class="col-md-8 col-md-offset-1">
	78	<select class="form-control" ng-model="order.tierBreak">
	79	<option value="" selected disabled>Select Price Quote</option>
	80	<option ng-repeat="list in tierList" value="{{list.minTierBreak}}-{{list.maxTierBreak}}">
	81	{{list.minTierBreak \| number: 2}}-{{list.maxTierBreak \| number: 2}} = ${{list.marginTotal \| number: 2}} {{list.marginTemplate.marginName}}
	82	</option>
	83	</select>
	84	</div>
	85	<div class="clearfix"></div>
	86	</div>
	87
	88	<div class="customInputWrap">
	89	<div class="col-md-3 text-right">
	90	<label>Uplift Date</label>
	91	</div>
	92	<div class="col-md-3">
	93	<input type="text" ng-model="order.upliftDate" datepicker class="form-control">
	94	</div>
	95	<div class="col-md-3 text-right">
	96	<label>Departing FBO</label>
	97	</div>
	98	<div class="col-md-3">
	99	<input type="text" ng-model="order.departingDate" datepicker class="form-control">
	100	</div>
	101	<div class="clearfix"></div>
	102	</div>
	103
	104	<div class="customInputWrap text-right">
	105	<div class="col-xs-12">
	106	<input type="cancel" value="Cancel" class="btn btn-default" style="margin-right: 15px; width: 100px;">
	107	<input type="submit" value="Dispatch" ng-click="dispatchFuel()" class="btn btn-primary">
	108	</div>
	109	<div class="clearfix"></div>
	110	</div>
	111
	112	</form>
	113	</div>
	114	</div>
	115	</div>
	116	</div>
	117	</div>

app/partials/enterFuelOrder/enterFuelOrder.service.js

Diff comments View file @8f7dbe9

File was created	1	(function(){
	2	'use strict';
	3	angular.module('acufuel')
	4	.service('enterFuelOrderService', ['$q', '$http', 'BASE_URL', enterFuelOrderService]);
	5
	6	function enterFuelOrderService($q, $http, BASE_URL) {
	7
	8	this.getAllCompanies = function() {
	9	var deferred = $q.defer();
	10	$http({
	11	method : 'GET',
	12	url : BASE_URL.url +'/user/allCompanies',
	13	headers : {'Content-Type': 'application/json'},
	14	})
	15	.then(function (result){
	16	deferred.resolve(result.data);
	17	},function (result){
	18	deferred.resolve(result.data);
	19	})
	20	return deferred.promise;
	21	}
	22
	23	this.getAircraft = function(id) {
	24	var deferred = $q.defer();
	25	$http({
	26	method : 'GET',
	27	url : BASE_URL.url +'/company/aircrafts/'+id,
	28	headers : {'Content-Type': 'application/json'},
	29	})
	30	.then(function (result){
	31	deferred.resolve(result.data);
	32	},function (result){
	33	deferred.resolve(result.data);
	34	})
	35	return deferred.promise;
	36	}
	37
	38	this.getJetTiers = function(id) {
	39	var deferred = $q.defer();
	40	$http({
	41	method : 'GET',
	42	url : BASE_URL.url +'/margin/getCustomMargins/'+id,
	43	headers : {'Content-Type': 'application/json'},
	44	})
	45	.then(function (result){
	46	deferred.resolve(result.data);
	47	},function (result){
	48	deferred.resolve(result.data);
	49	})
	50	return deferred.promise;
	51	}
	52
	53	this.getFuelPricingNew = function() {
	54	var deferred = $q.defer();
	55	$http({
	56	method : 'GET',
	57	url : BASE_URL.url +'/user/products',
	58	headers : {'Content-Type': 'application/json'},
	59	})
	60	.then(function (result){
	61	deferred.resolve(result.data);
	62	},function (result){
	63	deferred.resolve(result.data);
	64	})
	65	return deferred.promise;
	66	}
	67
	68	this.dispathFuelOrder = function(data) {
	69	var deferred = $q.defer();
	70	$http({
	71	method : 'POST',
	72	url : BASE_URL.url +'/fuelOrder',
	73	headers : {'Content-Type': 'application/json'},
	74	data: data
	75	})
	76	.then(function (result){
	77	deferred.resolve(result.data);
	78	},function (result){
	79	deferred.resolve(result.data);
	80	})
	81	return deferred.promise;
	82	}
	83
	84	}
	85
	86	})();

app/partials/fuelManager/fuelManager.controller.js

Diff comments View file @8f7dbe9

 'use strict';
  //Load controller
   angular.module('acufuel')
 	//.controller('fuelManagerController', ['$scope', 'fuelManagerService',function($scope, fuelManagerService) {
   .controller('fuelManagerController', ['$scope', '$rootScope', '$uibModal', '$filter', '$http', 'fuelManagerService', fuelManagerController]);
   function fuelManagerController($scope, $rootScope, $uibModal, $filter, $http, fuelManagerService) {
+      var todayDate = new Date();
+      var ddn = todayDate.getDate();
+      var mmn = todayDate.getMonth()+1; //January is 0!
+      var yyyyn = todayDate.getFullYear();
+      if(ddn<10) {
+          ddn ='0'+ddn
+      }
+      if(mmn<10) {
+          mmn ='0'+mmn
+      }
+      $scope.todayDateNew = mmn+'/'+ddn+'/'+yyyyn;
+      $scope.currentUserName = JSON.parse(window.localStorage.getItem("currentUserName"));
       $scope.currentUserData = JSON.parse(localStorage.getItem('userProfileId'));
       $scope.showLoader = true;
       fuelManagerService.getFullList().then(function(result) {
         $scope.fullJetList = result;
         console.log('$scope.fullJetList', $scope.fullJetList);
         for (var i = 0; i<$scope.fullJetList.length; i++) {
           for (var j = 0; j<$scope.fullJetList[i].aircraftsSize.length; j++) {
             if ($scope.fullJetList[i].aircraftsSize[j].rampFeesAndAvoidance != null) {
               if ($scope.fullJetList[i].aircraftsSize[j].rampFeesAndAvoidance.expirationDate != null && $scope.fullJetList[i].aircraftsSize[j].rampFeesAndAvoidance.expirationDate != '') {
                 var newTime = new Date($scope.fullJetList[i].aircraftsSize[j].rampFeesAndAvoidance.expirationDate);
                 var dmonth = newTime.getUTCMonth() + 1; //months from 1-12
                 var dday = newTime.getUTCDate();
                 var dyear = newTime.getUTCFullYear();
                 $scope.fullJetList[i].aircraftsSize[j].rampFeesAndAvoidance.expirationDate = dmonth+'/'+dday+'/'+dyear;
                 console.log('$scope.fullJetList.aircraftsSize.rampFeesAndAvoidance.expirationDate', $scope.fullJetList[i].aircraftsSize[j].rampFeesAndAvoidance.expirationDate);
               }
             }
           }
         }
         $scope.showLoader = false;
       })
       $scope.avoidanceList = {};
       $scope.updateList = function(fullJetList){
         $scope.showLoader = true;
         $scope.addData = [];
         $scope.newJetList = fullJetList;
         if ($scope.currentUserData != undefined || $scope.currentUserData != null) {
           for(var i=0; i<$scope.newJetList.length;i++){
               for(var j = 0; j < $scope.newJetList[i].aircraftsSize.length; j++){
                 if($scope.newJetList[i].aircraftsSize[j].rampFeesAndAvoidance != null){
                   if ($scope.newJetList[i].aircraftsSize[j].rampFeesAndAvoidance.expirationDate != null) {
                     $scope.newJetList[i].aircraftsSize[j].rampFeesAndAvoidance.expirationDate = new Date($scope.newJetList[i].aircraftsSize[j].rampFeesAndAvoidance.expirationDate);
                     $scope.newJetList[i].aircraftsSize[j].rampFeesAndAvoidance.expirationDate = $scope.newJetList[i].aircraftsSize[j].rampFeesAndAvoidance.expirationDate.getTime();
                   }
                   $scope.addData.push({
                       //'aircraftType': $scope.newJetList[i].aircraftsSize[j].rampFeesAndAvoidance.aircraftType,
                       'id': $scope.newJetList[i].aircraftsSize[j].rampFeesAndAvoidance.id,
                       'aircraftSizeId': $scope.newJetList[i].aircraftsSize[j].id,
                       'rampFees': $scope.newJetList[i].aircraftsSize[j].rampFeesAndAvoidance.rampFees,
                       'avoidance' : $scope.newJetList[i].aircraftsSize[j].rampFeesAndAvoidance.avoidance,
                       'applicable' : $scope.newJetList[i].aircraftsSize[j].rampFeesAndAvoidance.applicable,
                       'expirationDate' : $scope.newJetList[i].aircraftsSize[j].rampFeesAndAvoidance.expirationDate,
-                      'notes' : $scope.newJetList[i].aircraftsSize[j].rampFeesAndAvoidance.notes
+                      'notes' : $scope.newJetList[i].aircraftsSize[j].rampFeesAndAvoidance.notes,
+                      'reportedBy': $scope.currentUserName
                     });
                 }
               }
           }
           $scope.avoidanceList.rampFeesAndAvoidanceList = $scope.addData;
           $scope.avoidanceList.fboUserId = $scope.currentUserData;
           fuelManagerService.updateFullList($scope.avoidanceList).then(function(result) {
             toastr.success(''+result.success+'', {
               closeButton: true
             })
             fuelManagerService.getFullList().then(function(result) {
             $scope.fullJetList = result;
             console.log('$scope.fullJetList', $scope.fullJetList);
             for (var i = 0; i<$scope.fullJetList.length; i++) {
               for (var j = 0; j<$scope.fullJetList[i].aircraftsSize.length; j++) {
                 if ($scope.fullJetList[i].aircraftsSize[j].rampFeesAndAvoidance != null) {
                   if ($scope.fullJetList[i].aircraftsSize[j].rampFeesAndAvoidance.expirationDate != null && $scope.fullJetList[i].aircraftsSize[j].rampFeesAndAvoidance.expirationDate != '') {
                     var newTime = new Date($scope.fullJetList[i].aircraftsSize[j].rampFeesAndAvoidance.expirationDate);
                     var dmonth = newTime.getUTCMonth() + 1; //months from 1-12
                     var dday = newTime.getUTCDate();
                     var dyear = newTime.getUTCFullYear();
                     $scope.fullJetList[i].aircraftsSize[j].rampFeesAndAvoidance.expirationDate = dmonth+'/'+dday+'/'+dyear;
                     console.log('$scope.fullJetList.aircraftsSize.rampFeesAndAvoidance.expirationDate', $scope.fullJetList[i].aircraftsSize[j].rampFeesAndAvoidance.expirationDate);
                   }
                 }
               }
             }
             $scope.showLoader = false;
           })
           })
         }
       }
       $scope.dropOptions = {};
       fuelManagerService.getOptions().then(function(result) {
           $scope.dropOptions = result;
           console.log('$scope.dropOptions', $scope.dropOptions);
       })
       fuelManagerService.getAircrafts().then(function(result) {
           $scope.aircrafts = result;
       })
       $scope.customRampData = {};
       $scope.customRampDataCraft = {};
       $scope.customRampDataCraft.aircraftType = '';
       $scope.customRampDataCraft.aircraftSizeId = '';
       $scope.openRampFeeModal = false;
       $scope.showWeightForm = false;
       $scope.showMakeModelForm = false;
       $scope.showWingspanForm = false;
       $scope.showTailForm = false;
       $scope.customRampData = {};
       $scope.customMakeData = {};
       $scope.customWingspanData = {};
       $scope.customTailData = {};
       $scope.openRampModal = function(){
         $scope.showLoader = true;
         $scope.openRampFeeModal = true;
         if ($scope.customRampDataCraft.aircraftType != null) {
           for (var i = 0; i < $scope.dropOptions.length; i++) {
             if ($scope.customRampDataCraft.aircraftType === $scope.dropOptions[i].size) {
               $scope.customRampDataCraft.aircraftSizeId = $scope.dropOptions[i].id;
             }
           }
           $scope.OldRampData = {};
           fuelManagerService.getRampFeeDetail($scope.customRampDataCraft.aircraftSizeId).then(function(result) {
             $scope.OldRampData = result;
             if ($scope.customRampDataCraft.aircraftType === 'WEIGHT') {
               $scope.showWeightForm = true;
               $scope.showMakeModelForm = false;
               $scope.showWingspanForm = false;
               $scope.showTailForm = false;
               $scope.customRampData = $scope.OldRampData;
             }else if ($scope.customRampDataCraft.aircraftType === 'MAKE_AND_MODEL') {
               $scope.showWeightForm = false;
               $scope.showMakeModelForm = true;
               $scope.showWingspanForm = false;
               $scope.showTailForm = false;
               $scope.customMakeData = $scope.OldRampData;
               console.log('$scope.customMakeData', $scope.customMakeData);
             }else if ($scope.customRampDataCraft.aircraftType === 'WINGSPAN') {
               $scope.showWeightForm = false;
               $scope.showMakeModelForm = false;
               $scope.showWingspanForm = true;
               $scope.showTailForm = false;
               $scope.customWingspanData = $scope.OldRampData;
             }else if ($scope.customRampDataCraft.aircraftType === 'TAIL') {
               $scope.showWeightForm = false;
               $scope.showMakeModelForm = false;
               $scope.showWingspanForm = false;
               $scope.showTailForm = true;
               $scope.customTailData = $scope.OldRampData;
             }else{
               $scope.openRampFeeModal = false;
               $scope.showWeightForm = false;
               $scope.showMakeModelForm = false;
               $scope.showWingspanForm = false;
               $scope.showTailForm = false;
             }
             $scope.showLoader = false;
           })
         }else{
           $scope.openRampFeeModal = false;
         }
       }
       $scope.addCustomRampNew = function(data){
         $scope.showLoader = true;
         $scope.newCustomRampData = data;
         $scope.newRampData = [];
         if ($scope.newCustomRampData != null) {
           if ($scope.newCustomRampData.id != null) {
             $scope.newRampData.push({'id': $scope.newCustomRampData.id});
           }
           $scope.newRampData.push({
             'aircraftSizeId': $scope.customRampDataCraft.aircraftSizeId,
             'rampFees': $scope.newCustomRampData.rampFees,
             'avoidance': $scope.newCustomRampData.avoidance,
             'applicable': $scope.newCustomRampData.applicable,
             'expirationDate': $scope.newCustomRampData.expirationDate,
             'notes': $scope.newCustomRampData.notes,
             'aircraftMake': $scope.newCustomRampData.aircraftMake,
             'wingspanMin': $scope.newCustomRampData.wingspanMin,
             'wingspanMax': $scope.newCustomRampData.wingspanMax,
             'weightRangeMin': $scope.newCustomRampData.weightRangeMin,
             'weightRangeMax': $scope.newCustomRampData.weightRangeMax,
             'tailNumber': $scope.newCustomRampData.tailNumber,
           });
         }
         $scope.avoidanceList.rampFeesAndAvoidanceList = $scope.newRampData;
         $scope.avoidanceList.fboUserId = $scope.currentUserData;
         //console.log('$scope.newRampData', $scope.avoidanceList);
         fuelManagerService.updateFullList($scope.avoidanceList).then(function(result) {
           toastr.success(''+result.success+'', {
             closeButton: true
           })
           $scope.openRampFeeModal = false;
           fuelManagerService.getFullList().then(function(result) {
           $scope.fullJetList = result;
           console.log('$scope.fullJetList', $scope.fullJetList);
           for (var i = 0; i<$scope.fullJetList.length; i++) {
             for (var j = 0; j<$scope.fullJetList[i].aircraftsSize.length; j++) {
               if ($scope.fullJetList[i].aircraftsSize[j].rampFeesAndAvoidance != null) {
                 if ($scope.fullJetList[i].aircraftsSize[j].rampFeesAndAvoidance.expirationDate != null && $scope.fullJetList[i].aircraftsSize[j].rampFeesAndAvoidance.expirationDate != '') {
                   var newTime = new Date($scope.fullJetList[i].aircraftsSize[j].rampFeesAndAvoidance.expirationDate);
                   var dmonth = newTime.getUTCMonth() + 1; //months from 1-12
                   var dday = newTime.getUTCDate();
                   var dyear = newTime.getUTCFullYear();
                   $scope.fullJetList[i].aircraftsSize[j].rampFeesAndAvoidance.expirationDate = dmonth+'/'+dday+'/'+dyear;
                   console.log('$scope.fullJetList.aircraftsSize.rampFeesAndAvoidance.expirationDate', $scope.fullJetList[i].aircraftsSize[j].rampFeesAndAvoidance.expirationDate);
                 }
               }
             }
           }
           $scope.showLoader = false;
         })
         })
       }
       $scope.deleteTemplateId = '';
       $scope.deleteCustomJet = function(id){
         $('#confirm1').css('display', 'block');
         $scope.deleteTemplateId = id;
         console.log('$scope.deleteTemplateId', id);
       }
       $scope.saveAndCloseConfirm = function(){
         $scope.showLoader = true;
         $('#confirm1').css('display', 'none');
         fuelManagerService.deleteCustomRamp($scope.deleteTemplateId).then(function(result) {
           fuelManagerService.getFullList().then(function(result) {
             $scope.fullJetList = result;
             console.log('$scope.fullJetList', $scope.fullJetList);
             for (var i = 0; i<$scope.fullJetList.length; i++) {
               for (var j = 0; j<$scope.fullJetList[i].aircraftsSize.length; j++) {
                 if ($scope.fullJetList[i].aircraftsSize[j].rampFeesAndAvoidance != null) {
                   if ($scope.fullJetList[i].aircraftsSize[j].rampFeesAndAvoidance.expirationDate != null && $scope.fullJetList[i].aircraftsSize[j].rampFeesAndAvoidance.expirationDate != '') {
                     var newTime = new Date($scope.fullJetList[i].aircraftsSize[j].rampFeesAndAvoidance.expirationDate);
                     var dmonth = newTime.getUTCMonth() + 1; //months from 1-12
                     var dday = newTime.getUTCDate();
                     var dyear = newTime.getUTCFullYear();
                     $scope.fullJetList[i].aircraftsSize[j].rampFeesAndAvoidance.expirationDate = dmonth+'/'+dday+'/'+dyear;
                     console.log('$scope.fullJetList.aircraftsSize.rampFeesAndAvoidance.expirationDate', $scope.fullJetList[i].aircraftsSize[j].rampFeesAndAvoidance.expirationDate);
                   }
                 }
               }
             }
             $scope.showLoader = false;
           })
         })
       }
       $scope.cancelAndCloseConfirm = function(){
         $('#confirm1').css('display', 'none');
         $scope.deleteTemplateId = '';
       }
       $scope.closeRampFeeModel = function(){
         $scope.openRampFeeModal = false;
         $scope.showWeight = false;
         $scope.showWingspan = false;
         $scope.showTail = false;
         $scope.showAircraft = false;
         $scope.customRampData.rampFeesAndAvoidanceList = {};
         $scope.customRampDataCraft.aircraftType = null;
       }
       $scope.parentOpen = function(index){
         $('#parentOpen'+index).css('display', 'none');
         $('#parentClose'+index).css('display', 'initial');
         $('#parentTogglebody'+index).slideDown();
       }
       $scope.parentClose = function(index){
         $('#parentOpen'+index).css('display', 'initial');
         $('#parentClose'+index).css('display', 'none');
         $('#parentTogglebody'+index).slideUp();
       }
       $scope.toggleChild = function(id){
         if ($('.'+id).hasClass('fa-plus-circle')) {
           $('.'+id).removeClass('fa-plus-circle');
           $('.'+id).addClass('fa-minus-circle');
         }else{
           $('.'+id).removeClass('fa-minus-circle');
           $('.'+id).addClass('fa-plus-circle');
         }
         $('#'+id).slideToggle();
       }
       $scope.dates = [{date:'01-05-2001'}, {date:'05-05-2014'}, {date:'10-11-2008'}]
       $scope.open = function($event, dt) {
         $event.preventDefault();
         $event.stopPropagation();
         dt.opened = true;
       };
       $scope.dateOptions = {
         formatYear: 'yy',
         startingDay: 1
       };
       $scope.format = 'dd-MMMM-yyyy'
       $(document).ready(function(){
         setInterval(function(){
           var newHeight = $('.feeManagerLeft').height();
           $('.feeManagerRight').css('height', newHeight);
         }, 3);
         $('#customTabToggle1').click(function(){
           console.log('tab 1');
           $('#customTabsBody1').slideDown();
           $('#customTabsBody2').slideUp();
           $('#customTabsBody3').slideUp();
           $('#customTabsBody4').slideUp();
           $('#customTabs1').addClass('customActive');
           $('#customTabs2').removeClass('customActive');
           $('#customTabs3').removeClass('customActive');
           $('#customTabs4').removeClass('customActive');
           $('.customAccordianHeader > select, .customAccordianHeader > input').prop("disabled", true);
           $('.customAccordianHeader.customActive > select, .customAccordianHeader.customActive > input').prop("disabled", false);
           $('#customTabs1 > .pull-right > .btn-default').css('display', 'none');
           $('#customTabs1 > .pull-right > .btn-success').css('display', 'inline-block');
           $('#customTabs1 > .pull-right > .btn-danger').css('display', 'inline-block');
           $('#customTabs2 > .pull-right > .btn-default').css('display', 'inline-block');
           $('#customTabs2 > .pull-right > .btn-success').css('display', 'none');
           $('#customTabs2 > .pull-right > .btn-danger').css('display', 'none');
           $('#customTabs3 > .pull-right > .btn-default').css('display', 'inline-block');
           $('#customTabs3 > .pull-right > .btn-success').css('display', 'none');
           $('#customTabs3 > .pull-right > .btn-danger').css('display', 'none');
           $('#customTabs4 > .pull-right > .btn-default').css('display', 'inline-block');
           $('#customTabs4 > .pull-right > .btn-success').css('display', 'none');
           $('#customTabs4 > .pull-right > .btn-danger').css('display', 'none');
         })
         $('#customTabToggle2').click(function(){
           console.log('tab 2');
           $('#customTabsBody1').slideUp();
           $('#customTabsBody2').slideDown();
           $('#customTabsBody3').slideUp();
           $('#customTabsBody4').slideUp();
           $('#customTabs1').removeClass('customActive');
           $('#customTabs2').addClass('customActive');
           $('#customTabs3').removeClass('customActive');
           $('#customTabs4').removeClass('customActive');
           $('.customAccordianHeader > select, .customAccordianHeader > input').prop("disabled", true);
           $('.customAccordianHeader.customActive > select, .customAccordianHeader.customActive > input').prop("disabled", false);
           $('#customTabs1 > .pull-right > .btn-default').css('display', 'inline-block');
           $('#customTabs1 > .pull-right > .btn-success').css('display', 'none');
           $('#customTabs1 > .pull-right > .btn-danger').css('display', 'none');
           $('#customTabs2 > .pull-right > .btn-default').css('display', 'none');
           $('#customTabs2 > .pull-right > .btn-success').css('display', 'inline-block');
           $('#customTabs2 > .pull-right > .btn-danger').css('display', 'inline-block');
           $('#customTabs3 > .pull-right > .btn-default').css('display', 'inline-block');
           $('#customTabs3 > .pull-right > .btn-success').css('display', 'none');
           $('#customTabs3 > .pull-right > .btn-danger').css('display', 'none');
           $('#customTabs4 > .pull-right > .btn-default').css('display', 'inline-block');
           $('#customTabs4 > .pull-right > .btn-success').css('display', 'none');
           $('#customTabs4 > .pull-right > .btn-danger').css('display', 'none');
         })
         $('#customTabToggle3').click(function(){
           console.log('tab 3');
           $('#customTabsBody1').slideUp();
           $('#customTabsBody2').slideUp();
           $('#customTabsBody3').slideDown();
           $('#customTabsBody4').slideUp();
           $('#customTabs1').removeClass('customActive');
           $('#customTabs2').removeClass('customActive');
           $('#customTabs3').addClass('customActive');
           $('#customTabs4').removeClass('customActive');
           $('.customAccordianHeader > select, .customAccordianHeader > input').prop("disabled", true);
           $('.customAccordianHeader.customActive > select, .customAccordianHeader.customActive > input').prop("disabled", false);
           $('#customTabs1 > .pull-right > .btn-default').css('display', 'inline-block');
           $('#customTabs1 > .pull-right > .btn-success').css('display', 'none');
           $('#customTabs1 > .pull-right > .btn-danger').css('display', 'none');
           $('#customTabs2 > .pull-right > .btn-default').css('display', 'inline-block');
           $('#customTabs2 > .pull-right > .btn-success').css('display', 'none');
           $('#customTabs2 > .pull-right > .btn-danger').css('display', 'none');
           $('#customTabs3 > .pull-right > .btn-default').css('display', 'none');
           $('#customTabs3 > .pull-right > .btn-success').css('display', 'inline-block');
           $('#customTabs3 > .pull-right > .btn-danger').css('display', 'inline-block');
           $('#customTabs4 > .pull-right > .btn-default').css('display', 'inline-block');
           $('#customTabs4 > .pull-right > .btn-success').css('display', 'none');
           $('#customTabs4 > .pull-right > .btn-danger').css('display', 'none');
         })
         $('#customTabToggle4').click(function(){
           console.log('tab 4');
           $('#customTabsBody1').slideUp();
           $('#customTabsBody2').slideUp();
           $('#customTabsBody3').slideUp();
           $('#customTabsBody4').slideDown();
           $('#customTabs1').removeClass('customActive');
           $('#customTabs2').removeClass('customActive');
           $('#customTabs3').removeClass('customActive');
           $('#customTabs4').addClass('customActive');
           $('.customAccordianHeader > select, .customAccordianHeader > input').prop("disabled", true);
           $('.customAccordianHeader.customActive > select, .customAccordianHeader.customActive > input').prop("disabled", false);
           $('#customTabs1 > .pull-right > .btn-default').css('display', 'inline-block');
           $('#customTabs1 > .pull-right > .btn-success').css('display', 'none');
           $('#customTabs1 > .pull-right > .btn-danger').css('display', 'none');
           $('#customTabs2 > .pull-right > .btn-default').css('display', 'inline-block');
           $('#customTabs2 > .pull-right > .btn-success').css('display', 'none');
           $('#customTabs2 > .pull-right > .btn-danger').css('display', 'none');
           $('#customTabs3 > .pull-right > .btn-default').css('display', 'inline-block');
           $('#customTabs3 > .pull-right > .btn-success').css('display', 'none');
           $('#customTabs3 > .pull-right > .btn-danger').css('display', 'none');
           $('#customTabs4 > .pull-right > .btn-default').css('display', 'none');
           $('#customTabs4 > .pull-right > .btn-success').css('display', 'inline-block');
           $('#customTabs4 > .pull-right > .btn-danger').css('display', 'inline-block');
         })
       })
   }

app/partials/fuelManager/fuelManager.html

Diff comments View file @8f7dbe9

 <style>
    .subnavbar .mainnav > li:nth-child(2) > a{
    color: #ff9900;
    }
    button > i{
       cursor: pointer !important;
    }
    button[disabled] > i{
       cursor: not-allowed !important;
    }
 </style>
 <div class="myLoader" ng-show="showLoader">
    <img src="../img/hourglass.gif" width="50px;">
 </div>
 <div class="container">
    <div class="row">
       <div class="col-md-10">
          <div class="widget stacked">
             <div class="widget-header">
                <i class="fa fa-pencil"></i>
                <h3>Ramp Fee Manager</h3>
                <select style="float: right; margin: 8px 10px;" ng-model="customRampDataCraft.aircraftType" ng-change="openRampModal()">
                   <option disabled selected value="">Ramp Fee By Category</option>
                   <option ng-repeat="modals in dropOptions" value="{{modals.size}}">{{modals.size}}</option>
                </select>
             </div>
             <!-- /widget-header -->
             <div class="widget-content new-widget-content">
                <section id="accordions1">
                   <div class="newCustomAccordian">
                      <div class="col-md-9 feeManagerLeft" style="padding: 0;">
                         <div ng-repeat="list in fullJetList">
                            <div class="new-tab-heading">
                               <i class="fa fa-plus-circle" ng-click="parentOpen($index)" id="parentOpen{{$index}}" aria-hidden="true"></i>
                               <i class="fa fa-minus-circle" ng-click="parentClose($index)" id="parentClose{{$index}}" aria-hidden="true" style="display: none;"></i>
                               <span>{{list.type}}</span>
                            </div>
                            <div class="new-tab-body" id="parentTogglebody{{$index}}" style="display: none;">
                               <div class="new-tab-body-th">
-                                 <div class="col-md-4" ng-if="list.type != 'CUSTOM'">
+                                 <div class="col-md-4">
-                                    Aircraft Size
-                                 </div>
-                                 <div class="col-md-3" ng-if="list.type == 'CUSTOM'">
                                     Aircraft Size
                                  </div>
                                  <div class="col-md-2">
                                     Ramp/Facil. Fee
                                  </div>
                                  <div class="col-md-2">
                                     Avoidance
                                  </div>
-                                 <div class="col-md-2">
+                                 <div class="col-md-2" ng-if="list.type != 'CUSTOM'">
                                     Expiration Date
                                  </div>
                                  <div class="col-md-2">
                                     Applicable
                                  </div>
                                  <div class="col-md-1" ng-if="list.type == 'CUSTOM'">
                                     &nbsp;
                                  </div>
                                  <div class="clearfix"></div>
                               </div>
                               <div class="new-tab-body-td" ng-repeat="jets in list.aircraftsSize">
                                  <div>
-                                    <div class="col-md-4" ng-if="list.type != 'CUSTOM'">
+                                    <div class="col-md-4">
-                                       <i class="fa fa-plus-circle {{jets.id}}" ng-click="toggleChild(jets.id)" aria-hidden="true"></i>
-                                       <span style="margin-left: 5px;">{{jets.size}}</span>
-                                    </div>
-                                    <div class="col-md-3" ng-if="list.type == 'CUSTOM'">
                                        <i class="fa fa-plus-circle {{jets.id}}" ng-click="toggleChild(jets.id)" aria-hidden="true"></i>
                                        <span style="margin-left: 5px;">{{jets.size}}</span>
                                     </div>
                                     <div class="col-md-2">
                                        <input type="text" ng-disabled="jets.rampFeesAndAvoidance.applicable == false || jets.rampFeesAndAvoidance.applicable == null" ng-model="jets.rampFeesAndAvoidance.rampFees" style="padding: 5px 5px;">
                                     </div>
                                     <div class="col-md-2">
                                        <input type="text" ng-disabled="jets.rampFeesAndAvoidance.applicable == false || jets.rampFeesAndAvoidance.applicable == null" ng-model="jets.rampFeesAndAvoidance.avoidance" style="padding: 5px 5px;">
                                     </div>
-                                    <div class="col-md-2">
+                                    <div class="col-md-2" ng-if="list.type != 'CUSTOM'">
                                        <!-- <input type="date" ng-disabled="jets.rampFeesAndAvoidance.applicable == false || jets.rampFeesAndAvoidance.applicable == null" name="" ng-model="jets.rampFeesAndAvoidance.expirationDate"> -->
-                                       <input type="text" datepicker ng-disabled="jets.rampFeesAndAvoidance.applicable == false || jets.rampFeesAndAvoidance.applicable == null" ng-model="jets.rampFeesAndAvoidance.expirationDate" style="width: 90px; padding: 5px 5px;" />
+                                       <input type="text" ng-if="list.type != 'CUSTOM'" datepicker ng-disabled="jets.rampFeesAndAvoidance.applicable == false || jets.rampFeesAndAvoidance.applicable == null" ng-model="jets.rampFeesAndAvoidance.expirationDate" style="width: 90px; padding: 5px 5px;" />
                                     </div>
                                     <div class="col-md-2">
                                        <!-- <input type="checkbox" ng-model="jets.rampFeesAndAvoidance.applicable"> -->
                                        <div class="onoffswitch">
                                           <input type="checkbox" name="onoffswitch" class="onoffswitch-checkbox" id="{{jets.id}}{{$index}}" ng-model="jets.rampFeesAndAvoidance.applicable">
                                           <label class="onoffswitch-label" for="{{jets.id}}{{$index}}">
                                              <span class="onoffswitch-inner"></span>
                                              <span class="onoffswitch-switch">
                                                 <i class="fa fa-check" ng-show="jets.rampFeesAndAvoidance.applicable" aria-hidden="true"></i>
                                                 <i class="fa fa-times" ng-hide="jets.rampFeesAndAvoidance.applicable" aria-hidden="true"></i>
                                              </span>
                                           </label>
                                        </div>
                                     </div>
                                     <div class="col-md-1" ng-if="list.type == 'CUSTOM'">
                                        <button type="button" ng-disabled="jets.rampFeesAndAvoidance == null" ng-click="deleteCustomJet(jets.rampFeesAndAvoidance.id)" style="border: none; background-color: transparent; padding: 0;">
                                           <i class="fa fa-trash-o deleteTierIcon" style="cursor: default;" aria-hidden="true"></i>
                                        </button>
                                     </div>
                                     <div class="clearfix"></div>
                                  </div>
                                  <div style="display: none;" class="toggleCHildBody" id="{{jets.id}}">
                                     <div class="col-xs-12">
                                        <div class="col-xs-12">
                                           <div class="appliesTableHeading">Applies To:</div>
                                           <div class="appliesTableBody">
                                              <div class="firstDiv">
                                                 <label style="font-weight: normal;" ng-repeat="aircraftList in jets.aircrafts">{{aircraftList.model}}</label>
                                              </div>
                                              <div class="lastDiv">
                                                 <textarea ng-model="jets.rampFeesAndAvoidance.notes"></textarea>
                                                 <div class="reportedByTag">
                                                    <div class="confirmedTag">Confirmed</div>
                                                    <table>
                                                       <tr>
                                                          <td width="50%">
                                                             Reported By:
                                                          </td>
                                                          <td width="50%">
                                                             {{jets.rampFeesAndAvoidance.reportedBy}}
                                                          </td>
                                                       </tr>
                                                       <tr>
                                                          <td width="50%">
                                                             Reported On:
                                                          </td>
                                                          <td width="50%">
-                                                            {{jets.rampFeesAndAvoidance.reportedOn}}
+                                                            <!-- {{jets.rampFeesAndAvoidance.reportedOn}} -->
+                                                            {{todayDateNew}}
                                                          </td>
                                                       </tr>
                                                       <tr>
                                                          <td colspan="2">
                                                             <i>Click the Save Form button to Re-Confirm</i>
                                                          </td>
                                                       </tr>
                                                    </table>
                                                 </div>
                                              </div>
                                              <div class="clearfix"></div>
                                           </div>
                                        </div>
                                        <div class="clearfix"></div>
                                     </div>
                                     <div class="clearfix"></div>
                                  </div>
                               </div>
                            </div>
                         </div>
                      </div>
                      <div class="col-md-3 text-center feeManagerRight" style="padding: 0;">
                         <div class="text-center">
                            <button type="submit" ng-click="updateList(fullJetList)" class="btn btn-success"><i class="icon-ok"></i> Save Form</button>&nbsp;&nbsp;
                            <button type="reset" class="btn btn-default">Cancel</button>
                         </div>
                      </div>
                      <div class="clearfix"></div>
                      <br/>
                   </div>
                </section>
             </div>
             <!-- /widget-content -->
          </div>
          <!-- /widget -->
       </div>
       <!-- /span6 -->
    </div>
    <!-- /span12 -->
 </div> <!-- /container 2 -->
 <div ng-show="openRampFeeModal">
    <div class="customBackdrop">
       <div class="customModalInner">
          <div class="customModelHead">
             <p class="pull-left">
                <i class="fa fa-list-alt" aria-hidden="true"></i>
                Add Ramp Fee
             </p>
             <p class="pull-right">
                <i class="fa fa-times" aria-hidden="true" style="cursor: pointer;" ng-click="closeRampFeeModel()"></i>
             </p>
             <div class="clearfix"></div>
          </div>
          <div class="customModelBody">
             <div ng-show="showWeightForm">
                <div class="col-xs-12 col-sm-4">
                   Type:
                </div>
                <div class="col-xs-12 col-sm-4" style="padding-right: 0;">
                   <select class="form-control" style="border-radius: 0; height: 26px; padding: 0;"  ng-model="customRampDataCraft.aircraftType" ng-change="openRampModal()">
                      <option ng-repeat="modalsNew in dropOptions" value="{{modalsNew.size}}">{{modalsNew.size}}</option>
                   </select>
                </div>
                <div class="clearfix"></div>
                <br/>
                <div>
                   <div class="col-xs-12 col-sm-4">
                      Weight Range Min:
                   </div>
                   <div class="col-xs-12 col-sm-4" style="padding-right: 0;">
                      <input type="number" value="0.00" ng-model="customRampData.weightRangeMin" class="form-control" style="border-radius: 0; height: 26px; padding: 0 5px;" >
                   </div>
                   <div class="col-xs-12 col-sm-4" style="padding-left: 5px;">
                      lbs.
                   </div>
                   <div class="clearfix"></div>
                   <br/>
                   <div class="col-xs-12 col-sm-4">
                      Weight Range Max:
                   </div>
                   <div class="col-xs-12 col-sm-4" style="padding-right: 0;">
                      <input type="number" value="0.00" ng-model="customRampData.weightRangeMax" class="form-control" style="border-radius: 0; height: 26px; padding: 0 5px;" >
                   </div>
                   <div class="col-xs-12 col-sm-4" style="padding-left: 5px;">
                      lbs.
                   </div>
                   <div class="clearfix"></div>
                   <br/>
                </div>
                <div>
                   <div class="col-xs-12 col-sm-4">
                      Ramp/Facil. Fee($):
                   </div>
                   <div class="col-xs-12 col-sm-4" style="padding-right: 0;">
                      <input type="number" value="0" ng-model="customRampData.rampFees" class="form-control" style="border-radius: 0; height: 26px; padding: 0 5px;" >
                   </div>
                   <div class="clearfix"></div>
                   <br/>
                </div>
                <div>
                   <div class="col-xs-12 col-sm-4">
                      Avoidance:
                   </div>
                   <div class="col-xs-12 col-sm-4" style="padding-right: 0;">
                      <input type="number" value="0" ng-model="customRampData.avoidance" class="form-control" style="border-radius: 0; height: 26px; padding: 0 5px;" >
                   </div>
                   <div class="col-xs-12 col-sm-4" style="padding-left: 5px;">
                      gal.
                   </div>
                   <div class="clearfix"></div>
                </div>
             </div>
             <div ng-show="showMakeModelForm">
                <div class="col-xs-12 col-sm-4">
                   Type:
                </div>
                <div class="col-xs-12 col-sm-4" style="padding-right: 0;">
                   <select class="form-control" style="border-radius: 0; height: 26px; padding: 0;"  ng-model="customRampDataCraft.aircraftType" ng-change="openRampModal()">
                      <option ng-repeat="modalsNew in dropOptions" value="{{modalsNew.size}}">{{modalsNew.size}}</option>
                   </select>
                </div>
                <div class="clearfix"></div>
                <br/>
                <div>
                   <div class="col-xs-12 col-sm-4">
                      Aircraft Make:
                   </div>
                   <div class="col-xs-12 col-sm-4" style="padding-right: 0;">
                      <select class="form-control" style="border-radius: 0; height: 26px; padding: 0;" ng-model="customMakeData.aircraftMake">
                         <option ng-repeat="crafts in aircrafts" value="{{crafts}}">{{crafts}}</option>
                      </select>
                   </div>
                   <div class="clearfix"></div>
                   <br/>
                </div>
                <div>
                   <div class="col-xs-12 col-sm-4">
                      Ramp/Facil. Fee($):
                   </div>
                   <div class="col-xs-12 col-sm-4" style="padding-right: 0;">
                      <input type="number" value="0" ng-model="customMakeData.rampFees" class="form-control" style="border-radius: 0; height: 26px; padding: 0 5px;" >
                   </div>
                   <div class="clearfix"></div>
                   <br/>
                </div>
                <div>
                   <div class="col-xs-12 col-sm-4">
                      Avoidance:
                   </div>
                   <div class="col-xs-12 col-sm-4" style="padding-right: 0;">
                      <input type="number" value="0" ng-model="customMakeData.avoidance" class="form-control" style="border-radius: 0; height: 26px; padding: 0 5px;" >
                   </div>
                   <div class="col-xs-12 col-sm-4" style="padding-left: 5px;">
                      gal.
                   </div>
                   <div class="clearfix"></div>
                </div>
             </div>
             <div ng-show="showWingspanForm">
                <div class="col-xs-12 col-sm-4">
                   Type:
                </div>
                <div class="col-xs-12 col-sm-4" style="padding-right: 0;">
                   <select class="form-control" style="border-radius: 0; height: 26px; padding: 0;"  ng-model="customRampDataCraft.aircraftType" ng-change="openRampModal()">
                      <option ng-repeat="modalsNew in dropOptions" value="{{modalsNew.size}}">{{modalsNew.size}}</option>
                   </select>
                </div>
                <div class="clearfix"></div>
                <br/>
                <div>
                   <div class="col-xs-12 col-sm-4">
                      Wingspan Min:
                   </div>
                   <div class="col-xs-12 col-sm-4" style="padding-right: 0;">
                      <input type="number" value="0.00" ng-model="customWingspanData.wingspanMin" class="form-control" style="border-radius: 0; height: 26px; padding: 0 5px;" >
                   </div>
                   <div class="col-xs-12 col-sm-4" style="padding-left: 5px;">
                      ft.
                   </div>
                   <div class="clearfix"></div>
                   <br/>
                   <div class="col-xs-12 col-sm-4">
                      Wingspan Max:
                   </div>
                   <div class="col-xs-12 col-sm-4" style="padding-right: 0;">
                      <input type="number" value="0.00" ng-model="customWingspanData.wingspanMax" class="form-control" style="border-radius: 0; height: 26px; padding: 0 5px;" >
                   </div>
                   <div class="col-xs-12 col-sm-4" style="padding-left: 5px;">
                      ft.
                   </div>
                   <div class="clearfix"></div>
                   <br/>
                </div>
                <div>
                   <div class="col-xs-12 col-sm-4">
                      Ramp/Facil. Fee($):
                   </div>
                   <div class="col-xs-12 col-sm-4" style="padding-right: 0;">
                      <input type="number" value="0" ng-model="customWingspanData.rampFees" class="form-control" style="border-radius: 0; height: 26px; padding: 0 5px;" >
                   </div>
                   <div class="clearfix"></div>
                   <br/>
                </div>
                <div>
                   <div class="col-xs-12 col-sm-4">
                      Avoidance:
                   </div>
                   <div class="col-xs-12 col-sm-4" style="padding-right: 0;">
                      <input type="number" value="0" ng-model="customWingspanData.avoidance" class="form-control" style="border-radius: 0; height: 26px; padding: 0 5px;" >
                   </div>
                   <div class="col-xs-12 col-sm-4" style="padding-left: 5px;">
                      gal.
                   </div>
                   <div class="clearfix"></div>
                </div>
             </div>
             <div ng-show="showTailForm">
                <div class="col-xs-12 col-sm-4">
                   Type:
                </div>
                <div class="col-xs-12 col-sm-4" style="padding-right: 0;">
                   <select class="form-control" style="border-radius: 0; height: 26px; padding: 0;"  ng-model="customRampDataCraft.aircraftType" ng-change="openRampModal()">
                      <option ng-repeat="modalsNew in dropOptions" value="{{modalsNew.size}}">{{modalsNew.size}}</option>
                   </select>
                </div>
                <div class="clearfix"></div>
                <br/>
                <div>
                   <div class="col-xs-12 col-sm-4">
                      Tail Numbers:
                   </div>
                   <div class="col-xs-12 col-sm-4" style="padding-right: 0;">
                      <select class="form-control" style="border-radius: 0; height: 26px; padding: 0;" ng-model="customTailData.tailNumber">
                         <!-- <option ng-repeat="crafts in aircrafts" value="{{crafts}}">{{crafts}}</option> -->
                      </select>
                   </div>
                   <div class="clearfix"></div>
                   <br/>
                </div>
                <div>
                   <div class="col-xs-12 col-sm-4">
                      Ramp/Facil. Fee($):
                   </div>
                   <div class="col-xs-12 col-sm-4" style="padding-right: 0;">
                      <input type="number" value="0" ng-model="customTailData.rampFees" class="form-control" style="border-radius: 0; height: 26px; padding: 0 5px;" >
                   </div>
                   <div class="clearfix"></div>
                   <br/>
                </div>
                <div>
                   <div class="col-xs-12 col-sm-4">
                      Avoidance:
                   </div>
                   <div class="col-xs-12 col-sm-4" style="padding-right: 0;">
                      <input type="number" value="0" ng-model="customTailData.avoidance" class="form-control" style="border-radius: 0; height: 26px; padding: 0 5px;" >
                   </div>
                   <div class="col-xs-12 col-sm-4" style="padding-left: 5px;">
                      gal.
                   </div>
                   <div class="clearfix"></div>
                </div>
             </div>
          </div>
          <div class="customModelFooter text-center">
             <input type="submit" value="Save" class="btn" ng-show="showWeightForm" ng-click="addCustomRampNew(customRampData)">
             <input type="submit" value="Save" class="btn" ng-show="showMakeModelForm" ng-click="addCustomRampNew(customMakeData)">
             <input type="submit" value="Save" class="btn" ng-show="showWingspanForm" ng-click="addCustomRampNew(customWingspanData)">
             <input type="submit" value="Save" class="btn" ng-show="showTailForm" ng-click="addCustomRampNew(customTailData)">
             <button class="btn" ng-click="closeRampFeeModel()">Cancel</button>
          </div>
       </div>
    </div>
 </div>
 <div class="customConfirmPopBackdrop" id="confirm1">
   <div class="customModalInner">
      <div class="customModelBody" style="border-radius: 5px 5px 0 0;">
         <table>
            <tr>
               <td>
                  <img src="img/info.png" style="width: 50px;">
               </td>
               <td>
                  <p style="padding: 5px 10px; margin-bottom: 0;">Are you sure that you want to delete this Ramp Fee Template ?</p>
               </td>
            </tr>
         </table>
      </div>
      <div class="customModelFooter text-right" style="border-radius: 0 0 5px 5px;">
         <button class="btn" style="padding: 4px 0; width: 80px;" ng-click="saveAndCloseConfirm()">Yes</button>
         <button class="btn" style="padding: 4px 0; width: 80px;" ng-click="cancelAndCloseConfirm()">Cancel</button>
      </div>
   </div>
 </div>
 <!-- Le javascript
    ================================================== -->
 <!-- Placed at the end of the document so the pages load faster -->
 <script src="js/jquery-3.1.1.min.js"></script>
 <script src="js/plugins/bootstrap-datepicker.js"></script>
 <script type="text/javascript">
    $(document).ready(function(){
       $('#data_1 .input-group.date').datepicker({
           todayBtn: "linked",
           keyboardNavigation: false,
           forceParse: false,
           calendarWeeks: true,
           autoclose: true
         });
    })

app/partials/login/login.service.js

Diff comments View file @8f7dbe9

 (function(){
  'use strict';
     angular.module('acufuel')
       .service('LoginService', ['$rootScope', '$q', '$http', '$state', 'BASE_URL', 'AUTH_EVENTS', 'USER_ROLES', LoginService]);
       function LoginService($rootScope, $q, $http, $state, BASE_URL, AUTH_EVENTS, USER_ROLES) {
         var authService     = {},
             username        = '',
             role            = '',
             isAuthenticated = false;
         var currentUserDetail = JSON.parse(window.localStorage.getItem("currentUser"));
        // console.log(currentUserDetail)
         if (currentUserDetail) {
             //console.log('aaya')
             if(currentUserDetail.type == 'ADMIN' || currentUserDetail.type == 'FBO'){
                 $rootScope.isAuthenticated = true;
                 role = USER_ROLES.admin;
             }else if(currentUserDetail.type == 'FLIGHT_DEPT'){
                 $rootScope.isAuthenticated = false;
                 role = USER_ROLES.user;
             }
         }
         authService.loginUser = function(data) {
           var deferred = $q.defer();
           $http({
               method : 'POST',
               url : BASE_URL.url +'/login',
               headers : {'Content-Type': 'application/x-www-form-urlencoded'},
               data : data
           })
           .then(function (result){
               deferred.resolve(result.data);
           },function (result){
             //console.log(result.data)
               deferred.resolve(result.data);
           })
           return deferred.promise;
         }
         authService.authenticate = function() {
             var deferred = $q.defer();
             $http({
                method : 'GET',
                url : BASE_URL.url+'/user/authenticate',
                headers : {'Content-Type': 'application/x-www-form-urlencoded'}
             }).then(function (result){
                 if(result.data.userProfile.userType.type == 'ADMIN' || result.data.userProfile.userType.type == 'FBO' || result.data.userProfile.userType.type == 'FLIGHT_DEPT'){
                   authService.setUser(result.data);
                   $state.go('app.dashboard')
                 }else{
                   localStorage.clear();
                   toastr.info("Please check username and password");
                 }
                 deferred.resolve(result.data);
             },function (result){
                 deferred.resolve(result.data);
             });
             return deferred.promise;
         }
         // authService.setAuth = function(data) {
         //     localStorage.setItem('loginStatus', data);
         // }
         authService.logout = function(data) {
           // localStorage.clear();
           // $rootScope.isAuthenticated = false;
           // $rootScope.$broadcast(AUTH_EVENTS.updateUser);
           var deferred = $q.defer();
           $http({
               method : 'POST',
               url : BASE_URL.url +'/user/logout',
               headers : {'Content-Type': 'application/json'},
               data : data
           })
           .success(function(result) {
               deferred.resolve(result.data);
           })
           return deferred.promise;
         }
         authService.getUser = function () {
           return JSON.parse(window.localStorage.getItem("currentUser"));
         }
         authService.setUser = function (authData) {
+            console.log('authdata', authData);
             window.localStorage.setItem("currentUser", JSON.stringify(authData.userProfile.userType));
             window.localStorage.setItem("userProfileId", JSON.stringify(authData.userProfile.id));
+            window.localStorage.setItem('currentUserName', JSON.stringify(authData.userProfile.firstName +' '+ authData.userProfile.lastName));
             if(authData.userProfile.userType.type == 'ADMIN' || authData.userProfile.userType.type == 'FBO'){
                 role = USER_ROLES.admin;
                 $rootScope.isAuthenticated = true;
             }else if(authData.userProfile.userType.type == 'FLIGHT_DEPT'){
                 role = USER_ROLES.user;
                 $rootScope.isAuthenticated = false;
             }
         }
         authService.isAuthenticated = function () {
           return isAuthenticated;
         }
         authService.role = function () {
           return role;
         }
         authService.isAuthorized = function (authorizedRoles) {
           if (!angular.isArray(authorizedRoles)) {
             authorizedRoles = [authorizedRoles];
           }
           return (authService.isAuthenticated() && authorizedRoles.indexOf(role) !== -1);
         }
         return authService;
     }
 })();

app/partials/main/main.html

Diff comments View file @8f7dbe9

 <nav class="navbar navbar-inverse" role="navigation">
    <div class="container">
       <!-- Brand and toggle get grouped for better mobile display -->
       <div class="navbar-header">
          <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-ex1-collapse">
          <span class="sr-only">Toggle navigation</span>
          <i class="icon-cog"></i>
          </button>
          <a class="navbar-brand" ui-sref="app.dashboard">
             <img src="./img/acufuelLOGOwhite.png" class="img-logo">
          </a>
       </div>
       <!-- Collect the nav links, forms, and other content for toggling -->
       <div class="collapse navbar-collapse navbar-ex1-collapse">
          <ul class="nav navbar-nav navbar-right">
             <li class="dropdown">
                <a href="javscript:;" class="dropdown-toggle" data-toggle="dropdown">
                <i class="icon-plane"></i>
                Latitiude Jet Center
                <b class="caret"></b>
                </a>
                <ul class="dropdown-menu">
                   <li><a href="javascript:;">FBO Profile</a></li>
                   <li><a ui-sref="app.accountSetting">Account Settings</a></li>
                   <li class="divider"></li>
                   <li><a href="#" ng-click="logout();">Logout</a></li>
                </ul>
             </li>
          </ul>
       </div>
       <!-- /.navbar-collapse -->
    </div>
    <!-- /.container -->
 </nav>
 <div class="subnavbar">
    <div class="subnavbar-inner">
       <div class="container">
          <a href="javascript:;" class="subnav-toggle" data-toggle="collapse" data-target=".subnav-collapse">
          <span class="sr-only">Toggle navigation</span>
          <i class="icon-reorder"></i>
          </a>
          <div class="collapse subnav-collapse">
             <ul class="mainnav">
                <li>
                   <a ui-sref="app.dashboard">
                   <i class="fa fa-home"></i>
                   <span>Home</span>
                   </a>
                </li>
                <li class="dropdown">
                   <a href="javascript:;" class="dropdown-toggle" data-toggle="dropdown">
                   <i class="fa fa-tint"></i>
                   <span>Fuel Manager</span>
                   <b class="caret"></b>
                   </a>
                   <ul class="dropdown-menu">
                      <li><a ui-sref="app.updateFuelManager" href="#/updateFuelManager">Update Fuel Manager</a></li>
+                     <li>
+                        <a ui-sref="app.enterFuelOrder">Enter Fuel Order</a>
+                     </li>
                      <li><a ui-sref="app.fuelManager" href="#/fuelManager">Ramp Free Manager</a></li>
                      <li class="dropdown-submenu">
                         <a tabindex="-1" href="#">Tax Manager</a>
                         <ul class="dropdown-menu">
                            <li><a tabindex="-1" href="#">Federal Taxes</a></li>
                            <li><a href="#">State & Country Taxes</a></li>
                            <li><a href="#">Airport Taxes</a></li>
                         </ul>
                      </li>
                      <li class="dropdown-submenu">
                         <a tabindex="-1" href="#">Fuel Orders</a>
                         <ul class="dropdown-menu">
                            <li><a ui-sref="app.fuelOrders">Pending</a></li>
                            <li><a ui-sref="app.fuelOrders">Invoiced</a></li>
                            <li><a ui-sref="app.fuelOrders">Canceled</a></li>
                            <li><a ui-sref="app.fuelOrders">Archived</a></li>
                         </ul>
                      </li>
                   </ul>
                </li>
                <li class="dropdown">
                   <a href="javascript:;" class="dropdown-toggle" data-toggle="dropdown">
                   <i class="fa fa-user"></i>
                   <span>Customers</span>
                   <b class="caret"></b>
                   </a>
                   <ul class="dropdown-menu">
                     <!--  <li><a  ui-sref="app.viewCompany">View Companies</a></li> -->
                      <li><a  ui-sref="app.customers">View Contacts</a></li>
                      <li><a  ui-sref="app.account">View Fuel Vendors</a></li>
                      <li><a  ui-sref="app.analytics">Research Flight Dept</a></li>
                   </ul>
                </li>
                <li class="">
                   <a  ui-sref="app.scheduler">
                   <i class="fa fa-calendar"></i>
                   <span>Scheduler</span>
                   </a>
                </li>
                <li class="dropdown">
                   <a href="app.analytics:;" class="dropdown-toggle" data-toggle="dropdown">
                   <i class="fa fa-signal"></i>
                   <span>Analytics</span>
                   <b class="caret"></b>
                   </a>
                   <ul class="dropdown-menu">
                      <li><a href="#">Live Flight tracking</a></li>
                      <li><a href="#">Research Flight Dept</a></li>
                      <li><a href="#">Historical Fuel Prices</a></li>
                      <li><a href="#">Regional Pricing</a></li>
                      <li><a href="#">Actual vs. Canceled Fuelings</a></li>
                      <li><a href="#">Customer Lead Sources</a></li>
                   </ul>
                </li>
             </ul>
          </div>
          <!-- /.subnav-collapse -->
       </div>
       <!-- /container -->
    </div>
    <!-- /subnavbar-inner -->
 </div>
 <!-- /subnavbar -->
 <div ui-view></div>
 <!-- </body> -->
 <!-- footer -->
 <div class="extra">
    <div class="container">
       <div class="row">
          <div class="col-md-3">
             <h4>About</h4>
             <ul>
                <li><a href="javascript:;">About Us</a></li>
                <li><a href="javascript:;">Twitter</a></li>
                <li><a href="javascript:;">Facebook</a></li>
                <li><a href="javascript:;">Google+</a></li>
             </ul>
          </div>
          <!-- /span3 -->
          <div class="col-md-3">
             <h4>Support</h4>
             <ul>
                <li><a href="javascript:;">Frequently Asked Questions</a></li>
                <li><a href="javascript:;">Ask a Question</a></li>
                <li><a href="javascript:;">Video Tutorial</a></li>
                <li><a href="javascript:;">Feedback</a></li>
             </ul>
          </div>
          <!-- /span3 -->
          <div class="col-md-3">
             <h4>Legal</h4>
             <ul>
                <li><a href="javascript:;">License</a></li>
                <li><a href="javascript:;">Terms of Use</a></li>
                <li><a href="javascript:;">Privacy Policy</a></li>
                <li><a href="javascript:;">Security</a></li>
             </ul>
          </div>
          <!-- /span3 -->
          <div class="col-md-3">
             <h4>Settings</h4>
             <ul>
                <li><a href="javascript:;">Consectetur adipisicing</a></li>
                <li><a href="javascript:;">Eiusmod tempor </a></li>
                <li><a href="javascript:;">Fugiat nulla pariatur</a></li>
                <li><a href="javascript:;">Officia deserunt</a></li>
             </ul>
          </div>
          <!-- /span3 -->
       </div>
       <!-- /row -->
    </div>
    <!-- /container -->
 </div>
 <!-- /extra -->
 <div class="footer">
    <div class="container">
       <div class="row">
          <div id="footer-copyright" class="col-md-6">
             &copy; 2012-13 Jumpstart UI.
          </div>
          <!-- /span6 -->
          <div id="footer-terms" class="col-md-6">
             Theme by <a href="http://jumpstartui.com" target="_blank">Jumpstart UI</a>
          </div>
          <!-- /.span6 -->
       </div>
       <!-- /row -->
    </div>
    <!-- /container -->
 </div>

app/partials/viewcontact/viewcontact.controller.js

Diff comments View file @8f7dbe9

1	'use strict';	1	'use strict';
2		2
3	//Load controller	3	//Load controller
4	angular.module('acufuel')	4	angular.module('acufuel')
5		5
6	.controller('viewcontactController', ['$scope', '$stateParams', '$state', 'ViewcontactService', 'ViewCompanyService', function($scope, $stateParams, $state, ViewcontactService, ViewCompanyService) {	6	.controller('viewcontactController', ['$scope', '$stateParams', '$state', 'ViewcontactService', 'ViewCompanyService', function($scope, $stateParams, $state, ViewcontactService, ViewCompanyService) {
7	$scope.showLoader = true;	7	$scope.showLoader = true;
8	$scope.showUpdateBtn = false;	8	$scope.showUpdateBtn = false;
9	var contactId = $stateParams.id;	9	var contactId = $stateParams.id;
10	$scope.contactDetail = {};	10	$scope.contactDetail = {};
11	var contactCompanyId = "";	11	var contactCompanyId = "";
12	ViewcontactService.getContact(contactId).then(function(result) {	12	ViewcontactService.getContact(contactId).then(function(result) {
13	$scope.contactDetail = result;	13	$scope.contactDetail = result;
14	$scope.showLoader = false;	14	$scope.showLoader = false;
15	contactCompanyId = result.owner.id;	15	contactCompanyId = result.owner.id;
16	})	16	})
17		17
18	$scope.contactIdList = {};	18	$scope.contactIdList = {};
19	var index;	19	var index;
20	var one = 1;	20	var one = 1;
21	var selectedId;	21	var selectedId;
22		22
23	ViewcontactService.getContactsList(contactId).then(function(list){	23	ViewcontactService.getContactsList(contactId).then(function(list){
24	$scope.contactIdList = list;	24	$scope.contactIdList = list;
25	index = $scope.contactIdList.indexOf(contactId);	25	index = $scope.contactIdList.indexOf(contactId);
26	selectedId = $scope.contactIdList[index];	26	selectedId = $scope.contactIdList[index];
27	})	27	})
28		28
29	$scope.nextContact = function(){	29	$scope.nextContact = function(){
30	$scope.showLoader = true;	30	$scope.showLoader = true;
31	index = index + one;	31	index = index + one;
32	selectedId = $scope.contactIdList[index];	32	selectedId = $scope.contactIdList[index];
33	ViewcontactService.getContact(selectedId).then(function(result) {	33	ViewcontactService.getContact(selectedId).then(function(result) {
34	$scope.contactDetail = result;	34	$scope.contactDetail = result;
35	$scope.showLoader = false;	35	$scope.showLoader = false;
36	})	36	})
37	}	37	}
38		38
39	$scope.prevContact = function(){	39	$scope.prevContact = function(){
40	$scope.showLoader = true;	40	$scope.showLoader = true;
41	index = index - one;	41	index = index - one;
42	selectedId = $scope.contactIdList[index];	42	selectedId = $scope.contactIdList[index];
43	ViewcontactService.getContact(selectedId).then(function(result) {	43	ViewcontactService.getContact(selectedId).then(function(result) {
44	$scope.contactDetail = result;	44	$scope.contactDetail = result;
45	$scope.showLoader = false;	45	$scope.showLoader = false;
46	})	46	})
47	}	47	}
48		48
49	$scope.changePriceEmail = function(id){	49	$scope.changePriceEmail = function(id){
50	var statusData = "status=" + $scope.contactDetail.priceEmail;	50	var statusData = "status=" + $scope.contactDetail.priceEmail;
51	ViewcontactService.changePriceEmail(id, statusData).then(function(result) {	51	ViewcontactService.changePriceEmail(id, statusData).then(function(result) {
52	if(result.success){	52	if(result.success){
53	$('#toogleMail').css('display', 'block');	53	$('#toogleMail').css('display', 'block');
54	if($scope.contactDetail.priceEmail == true){	54	if($scope.contactDetail.priceEmail == true){
55	$scope.messageText = 'You have enabled price distribution for this contact';	55	$scope.messageText = 'You have enabled price distribution for this contact';
56	}else{	56	}else{
57	$scope.messageText = 'You have disabled price distribution for this contact';	57	$scope.messageText = 'You have disabled price distribution for this contact';
58	}	58	}
59	}	59	}
60	})	60	})
61	}	61	}
62		62
63	$scope.cancelToogle = function(){	63	$scope.cancelToogle = function(){
64	$('#toogleMail').css('display', 'none');	64	$('#toogleMail').css('display', 'none');
65	}	65	}
66		66	$scope.disableNext = true;
		67	$scope.disablePrev = true;
67	setInterval(function(){	68	setInterval(function(){
68	var checkMaxLength = $scope.contactIdList.length - one;	69	var checkMaxLength = $scope.contactIdList.length - one;
69	if (index === checkMaxLength) {	70	if (index === checkMaxLength) {
70	$scope.disableNext = true;	71	$scope.disableNext = true;
71	}else{	72	}else{
72	$scope.disableNext = false;	73	$scope.disableNext = false;
73	}	74	}
74	if (index === 0) {	75	if (index === 0) {
75	$scope.disablePrev = true;	76	$scope.disablePrev = true;
76	}else{	77	}else{
77	$scope.disablePrev = false;	78	$scope.disablePrev = false;
78	}	79	}
79	}, 3);	80	}, 1);
80		81
81	$scope.editName = true;	82	$scope.editName = true;
82	$scope.editCompany = true;	83	$scope.editCompany = true;
83	$scope.editAddress = true;	84	$scope.editAddress = true;
84	$scope.editPhone = true;	85	$scope.editPhone = true;
85	$scope.editMobile = true;	86	$scope.editMobile = true;
86	$scope.editEmail = true;	87	$scope.editEmail = true;
87	$scope.editContactNotes = true;	88	$scope.editContactNotes = true;
88		89
89	$scope.nameEdit = function(){	90	$scope.nameEdit = function(){
90	$scope.editName = false;	91	$scope.editName = false;
91	$scope.showUpdateBtn = true;	92	$scope.showUpdateBtn = true;
92	}	93	}
93	$scope.addressEdit = function(){	94	$scope.addressEdit = function(){
94	$scope.editAddress = false;	95	$scope.editAddress = false;
95	$scope.showUpdateBtn = true;	96	$scope.showUpdateBtn = true;
96	}	97	}
97	$scope.phoneEdit = function(){	98	$scope.phoneEdit = function(){
98	$scope.editPhone = false;	99	$scope.editPhone = false;
99	$scope.showUpdateBtn = true;	100	$scope.showUpdateBtn = true;
100	}	101	}
101	$scope.mobileEdit = function(){	102	$scope.mobileEdit = function(){
102	$scope.editMobile = false;	103	$scope.editMobile = false;
103	$scope.showUpdateBtn = true;	104	$scope.showUpdateBtn = true;
104	}	105	}
105	$scope.emailEdit = function(){	106	$scope.emailEdit = function(){
106	$scope.editEmail = false;	107	$scope.editEmail = false;
107	$scope.showUpdateBtn = true;	108	$scope.showUpdateBtn = true;
108	}	109	}
109	$scope.notesEdit = function(){	110	$scope.notesEdit = function(){
110	$scope.editContactNotes = false;	111	$scope.editContactNotes = false;
111	$scope.showUpdateBtn = true;	112	$scope.showUpdateBtn = true;
112	}	113	}
113		114
114	$scope.conData = {};	115	$scope.conData = {};
115	$scope.contactData = {};	116	$scope.contactData = {};
116	$scope.contactData.contactList = [];	117	$scope.contactData.contactList = [];
117	$scope.updateContact = function(data){	118	$scope.updateContact = function(data){
118	$scope.showLoader = true;	119	$scope.showLoader = true;
119	$scope.editName = true;	120	$scope.editName = true;
120	$scope.editCompany = true;	121	$scope.editCompany = true;
121	$scope.editAddress = true;	122	$scope.editAddress = true;
122	$scope.editPhone = true;	123	$scope.editPhone = true;
123	$scope.editMobile = true;	124	$scope.editMobile = true;
124	$scope.editEmail = true;	125	$scope.editEmail = true;
125	$scope.editContactNotes = true;	126	$scope.editContactNotes = true;
126		127
127	$scope.conData.address = data.address;	128	$scope.conData.address = data.address;
128	$scope.conData.email = data.email;	129	$scope.conData.email = data.email;
129	$scope.conData.firstName = data.firstName;	130	$scope.conData.firstName = data.firstName;
130	$scope.conData.id = data.id;	131	$scope.conData.id = data.id;
131	$scope.conData.lastName = data.lastName;	132	$scope.conData.lastName = data.lastName;
132	$scope.conData.mobilePhone = data.mobilePhone;	133	$scope.conData.mobilePhone = data.mobilePhone;
133	$scope.conData.note = data.note;	134	$scope.conData.note = data.note;
134	$scope.conData.password = data.password;	135	$scope.conData.password = data.password;
135	$scope.conData.priceEmail = data.priceEmail;	136	$scope.conData.priceEmail = data.priceEmail;
136	$scope.conData.primaryContact = data.primaryContact;	137	$scope.conData.primaryContact = data.primaryContact;
137	$scope.conData.title = data.title;	138	$scope.conData.title = data.title;
138	$scope.conData.userName = data.userName;	139	$scope.conData.userName = data.userName;
139	$scope.conData.workPhone = data.workPhone;	140	$scope.conData.workPhone = data.workPhone;
140	$scope.conData.companyId = data.owner.id;	141	$scope.conData.companyId = data.owner.id;
141		142
142	$scope.contactData.contactList.push($scope.conData);	143	$scope.contactData.contactList.push($scope.conData);
143	$scope.contactData.contactList.push();	144	$scope.contactData.contactList.push();
144	ViewcontactService.updateContact($scope.contactData).then(function(result) {	145	ViewcontactService.updateContact($scope.contactData).then(function(result) {
145	if(result.success){	146	if(result.success){
146	toastr.success(''+result.success+'', {	147	toastr.success(''+result.success+'', {
147	closeButton: true	148	closeButton: true
148	})	149	})
149	$scope.showUpdateBtn = false;	150	$scope.showUpdateBtn = false;
150	}else{	151	}else{
151	toastr.error(''+result.statusText+'', {	152	toastr.error(''+result.statusText+'', {
152	closeButton: true	153	closeButton: true
153	})	154	})
154	}	155	}
155	$scope.showLoader = false;	156	$scope.showLoader = false;
156	})	157	})
157	}	158	}
158		159
159	$scope.cancelContact = function(){	160	$scope.cancelContact = function(){
160	$scope.editName = true;	161	$scope.editName = true;
161	$scope.editCompany = true;	162	$scope.editCompany = true;
162	$scope.editAddress = true;	163	$scope.editAddress = true;
163	$scope.editPhone = true;	164	$scope.editPhone = true;
164	$scope.editMobile = true;	165	$scope.editMobile = true;
165	$scope.editEmail = true;	166	$scope.editEmail = true;
166	$scope.editContactNotes = true;	167	$scope.editContactNotes = true;
167	$scope.showUpdateBtn = false;	168	$scope.showUpdateBtn = false;
168	}	169	}
169		170
170	$scope.checkPrimaryContact = function(companyId){	171	$scope.checkPrimaryContact = function(companyId){
171	if($scope.contactDetail.primaryContact == true){	172	if($scope.contactDetail.primaryContact == true){
172	ViewCompanyService.checkPrimaryContact(companyId).then(function(result) {	173	ViewCompanyService.checkPrimaryContact(companyId).then(function(result) {
173	console.log(result)	174	console.log(result)
174	if(result.status == 422){	175	if(result.status == 422){
175	$('#primaryContact').css('display', 'block');	176	$('#primaryContact').css('display', 'block');
176	}	177	}
177	})	178	})
178	}	179	}
179	}	180	}
180		181
181	$scope.cancelPrimaryContact = function(){	182	$scope.cancelPrimaryContact = function(){
182	$('#primaryContact').css('display', 'none');	183	$('#primaryContact').css('display', 'none');
183	$scope.contactDetail.primaryContact = false;	184	$scope.contactDetail.primaryContact = false;
184	console.log($scope.contactDetail.primaryContact)	185	console.log($scope.contactDetail.primaryContact)
185	}	186	}
186		187
187	$scope.sendPrimaryContact = function(id){	188	$scope.sendPrimaryContact = function(id){
188	$('#primaryContact').css('display', 'none');	189	$('#primaryContact').css('display', 'none');
189	var priamryContactData = "companyContactId=" + id + "&primary=" + $scope.contactDetail.primaryContact;	190	var priamryContactData = "companyContactId=" + id + "&primary=" + $scope.contactDetail.primaryContact;
190		191
191	ViewCompanyService.addPrimaryContact(priamryContactData).then(function(result) {	192	ViewCompanyService.addPrimaryContact(priamryContactData).then(function(result) {
192	console.log(result)	193	console.log(result)
193	})	194	})
194		195
195	}	196	}
196		197
197	var deleteContact = "";	198	var deleteContact = "";
198	$scope.deleteContact = function(id){	199	$scope.deleteContact = function(id){
199	$('#delete2').css('display', 'block');	200	$('#delete2').css('display', 'block');
200	deleteContact = id;	201	deleteContact = id;
201	}	202	}
202		203
203	$scope.contactDelete = function(){	204	$scope.contactDelete = function(){
204	ViewcontactService.deleteContact(deleteContact).then(function(result) {	205	ViewcontactService.deleteContact(deleteContact).then(function(result) {
205	console.log(result)	206	console.log(result)
206	if(result.success){	207	if(result.success){
207	deleteContact = "";	208	deleteContact = "";
208	$('#delete2').css('display', 'none');	209	$('#delete2').css('display', 'none');
209	toastr.success(''+result.success+'', {	210	toastr.success(''+result.success+'', {
210	closeButton: true	211	closeButton: true
211	})	212	})
212	$state.go('app.viewCompany', {"id": contactCompanyId});	213	$state.go('app.viewCompany', {"id": contactCompanyId});
213	}	214	}
214		215
215	})	216	})
216	}	217	}
217		218
218	$scope.cancelDelete = function(){	219	$scope.cancelDelete = function(){
219	$('#delete2').css('display', 'none');	220	$('#delete2').css('display', 'none');
220	}	221	}
221		222
222	}]);	223	}]);
223		224

app/partials/viewcontact/viewcontact.html

Diff comments View file @8f7dbe9

+<style type="text/css">
+  .toggle.btn{
+    width: 140px !important;
+  }
+</style>
 <div class="myLoader" ng-show="showLoader">
   <img src="../img/hourglass.gif" width="50px;">
 </div>
 <div class="container">
    <div class="row">
       <div class="col-md-10" style="padding-right: 60px; margin-bottom: 30px;">
          <div class="widget">
             <div class="widget-header">
                <i class="icon-pencil"></i>
                 <i class="fa fa-building-o" aria-hidden="true"></i>
                <h3>Antioch Flight Department</h3>
             </div>
             <div class="widget-content" style="padding-left: 0; padding-right: 0; ">
                <div class="container">
                   <div style="margin-bottom: 25px;">
                     <button ng-disabled="disablePrev" class="newButtons" ng-click="prevContact()">
                       <i class="fa fa-long-arrow-left" aria-hidden="true"></i>
                       Previous Contact
                     </button>
                     <button ng-disabled="disableNext" class="newButtons" ng-click="nextContact()">
                       Next Contact
                       <i class="fa fa-long-arrow-right" aria-hidden="true"></i>
                     </button>
                   </div>
                   <div class="row">
                      <div class="col-md-6" style="margin-left: 20px;">
                      <div class="widget stacked">
                         <div class="widget-header">
                            <i class="fa fa-building-o" aria-hidden="true"></i>
                            <h3 style="margin-right: 0px;">Contact Detail</h3>
                            <i class="fa fa-trash-o deleteTierIcon" ng-click="deleteContact(contactDetail.id)" style="color: white;" aria-hidden="true"></i>
                             <div class="pull-right" style="margin-top: 5px; margin-right: 10px;">
-                              <toggle ng-model="contactDetail.priceEmail" ng-change="changePriceEmail(contactDetail.id)" size="customToogle" on="PRICE EMAIL ON" off="PRICE EMAIL OFF"></toggle>
+                              <toggle ng-model="contactDetail.priceEmail" style="width: 140px;" ng-change="changePriceEmail(contactDetail.id)" size="customToogle" on="PRICE EMAIL ON" off="PRICE EMAIL OFF"></toggle>
                             </div>
                         </div>
                         <div class="widget-content">
                            <div class="row" style="margin-left:0px">
                               <div class="col-md-6" style="padding-left: 0px;">
                                  <h3>
                                     <b ng-show="editName" style="color:#F90;">{{contactDetail.firstName}} {{contactDetail.lastName}}</b>
                                     <input type="text" ng-hide="editName" class="form-control" style="width: 49%; float: left; margin-right: 1%;" ng-model="contactDetail.firstName">
                                     <input type="text" ng-hide="editName" class="form-control" style="width: 49%;" ng-model="contactDetail.lastName">
                                     &nbsp;<i class="fa fa-pencil-square-o" ng-show="editName" ng-click="nameEdit()" style="font-size: 11px;" aria-hidden="true"></i>
                                  </h3>
                                  {{contactDetail.owner.companyName}}
                               </div>
                               <div class="col-md-6">
                                   <div style="margin-bottom: 10px" class="input-group email-password">
                                       <span class="input-group-addon email-password"><i class="glyphicon glyphicon-user email-password-icon"></i></span>
                                       <input id="login-username" type="text" ng-model="contactDetail.userName" class="form-control email-password" placeholder="username or email">
                                   </div>
                                  <!--  <div class="input-group email-password">
                                       <span class="input-group-addon email-password"><i class="fa fa-key" aria-hidden="true"></i></span>
                                       <input id="login-password" type="password" class="form-control email-password" name="password" placeholder="password">
                                   </div> -->
                               </div>
                            </div>
                            <div>
                               <p>
                                 <span ng-show="editAddress">
                                   <i class="fa fa-map-marker"></i> {{contactDetail.address}} &nbsp;
                                   <i class="fa fa-pencil-square-o" ng-click="addressEdit()" style="font-size: 11px;" aria-hidden="true"></i>
                                 </span>
                                 <input type="text" ng-hide="editAddress" style="width: 50%;" class="form-control" ng-model="contactDetail.address">
                               </p>
                               <p ng-show="editPhone"><i class="fa fa-phone"></i> {{contactDetail.mobilePhone}} &nbsp;<i class="fa fa-pencil-square-o" ng-click="phoneEdit()" style="font-size: 11px;" aria-hidden="true"></i></p>
                               <p ng-hide="editPhone">
                                 <input type="text" style="width: 50%;" ng-model="contactDetail.mobilePhone" class="form-control">
                               </p>
                               <p ng-show="editMobile"><i class="fa fa-mobile"></i> {{contactDetail.workPhone}} &nbsp;<i class="fa fa-pencil-square-o" ng-click="mobileEdit()" style="font-size: 11px;" aria-hidden="true"></i></p>
                               <p ng-hide="editMobile">
                                 <input type="text" style="width: 50%;" ng-model="contactDetail.workPhone" class="form-control">
                               </p>
                               <p ng-show="editEmail"><i class="fa fa-envelope"></i> {{contactDetail.email}} &nbsp;<i class="fa fa-pencil-square-o" ng-click="emailEdit()" style="font-size: 11px;" aria-hidden="true"></i></p>
                               <p ng-hide="editEmail">
                                 <input type="email" style="width: 50%;" ng-model="contactDetail.email" class="form-control">
                               </p>
                               <div>
                                 <input type="checkbox" ng-checked="contactDetail.primaryContact" ng-click="checkPrimaryContact(contactDetail.owner.id)" ng-model="contactDetail.primaryContact">&nbsp;
                                 <span>Primary Contact </span>
                              </div>
                            </div>
                            </br>
                            <div>
                               <p><b>Contact Notes</b> &nbsp;<i ng-show="editContactNotes" class="fa fa-pencil-square-o" ng-click="notesEdit()" style="font-size: 11px;" aria-hidden="true"></i>
                               <p ng-show="editContactNotes">{{contactDetail.note}}</p>
                               <p ng-hide="editContactNotes">
                                 <textarea ng-model="contactDetail.note" class="form-control" style="resize: vertical;"></textarea>
                               </p>
                               <div>
                                 <button ng-click="updateContact(contactDetail)" ng-show="showUpdateBtn" class="btn btn-success pull-left">Update Contact</button>
                                 <button ng-click="cancelContact()" style="margin-left: 5px;" ng-show="showUpdateBtn" class="btn btn-default pull-left">Cancel</button>
                                 <button type="button" class="btn btn-primary pull-right">Send Price to This Contacts</button>
                                 <div class="clearfix"></div>
                               </div>
                            </div>
                            <!-- <div class="col-md-6">
                               <button type="button" class="btn btn-primary">Send Price to This Contacts</button>
                            </div> -->
                         </div>
                      </div>
                   </div>
                </div>
             </div>
          </div>
       </div>
    </div>
 </div>
 <div class="customConfirmPopBackdrop" id="primaryContact">
    <div class="customModalInner" style="max-width: 400px;">
       <div class="customModelBody" style="border-radius: 5px 5px 0 0;">
          <table>
             <tr>
                <td>
                   <img src="img/info.png" style="width: 50px;">
                </td>
                <td>
                   <p style="padding: 5px 10px; margin-bottom: 0;">Are you sure you want to set this person as your primary contact?</p>
                </td>
             </tr>
          </table>
       </div>
       <div class="customModelFooter text-right" style="border-radius: 0 0 5px 5px;">
          <button class="btn" style="padding: 4px 0; width: 80px;" ng-click="sendPrimaryContact(contactDetail.id)">Yes</button>
          <button class="btn" style="padding: 4px 0; width: 80px;" ng-click="cancelPrimaryContact()">Cancel</button>
       </div>
    </div>
 </div>
 <div class="customConfirmPopBackdrop" id="toogleMail">
    <div class="customModalInner" style="max-width: 400px;">
       <div class="customModelBody" style="border-radius: 5px 5px 0 0;">
          <table>
             <tr>
                <!-- <td>
                   <img src="" style="width: 50px;">
                </td> -->
                <td>
                   <p style="padding: 5px 10px; margin-bottom: 0;text-align: center;">{{messageText}}</p>
                </td>
             </tr>
          </table>
       </div>
       <div class="customModelFooter text-right" style="border-radius: 0 0 5px 5px;">
          <button class="btn" style="padding: 4px 0; width: 80px;" ng-click="cancelToogle()">Cancel</button>
       </div>
    </div>
 </div>
 <div class="customConfirmPopBackdrop" id="delete2">
    <div class="customModalInner" style="max-width: 400px;">
       <div class="customModelBody" style="border-radius: 5px 5px 0 0;">
          <table>
             <tr>
                <td>
                   <img src="img/info.png" style="width: 50px;">
                </td>
                <td>
                   <p style="padding: 5px 10px; margin-bottom: 0;">Please confirm! Are you sure you want to DELETE this Contact?</p>
                </td>
             </tr>
          </table>
       </div>
       <div class="customModelFooter text-right" style="border-radius: 0 0 5px 5px;">
          <button class="btn" style="padding: 4px 0; width: 80px;" ng-click="contactDelete()">Accept</button>
          <button class="btn" style="padding: 4px 0; width: 80px;" ng-click="cancelDelete()">Cancel</button>
       </div>
    </div>
 </div>

bower.json

Diff comments View file @8f7dbe9

 {
   "name": "acufuel",
   "description": "",
   "main": "index.js",
   "authors": [
     "Rishav <rsingla.rishu@gmail.com>"
   ],
   "license": "ISC",
   "homepage": "",
   "ignore": [
     "**/.*",
     "node_modules",
     "bower_components",
     "test",
     "tests"
   ],
   "dependencies": {
     "angular": "^1.6.2",
     "angular-animate": "^1.6.2",
     "angular-route": "^1.6.2",
     "jquery": "^3.1.1",
     "animate.css": "^3.5.2",
     "bootstrap": "^3.3.7",
     "font-awesome": "fontawesome#^4.7.0",
     "angular-ui-router": "^0.4.2",
     "bootstrap-toggle": "^2.2.2",
     "fullcalendar": "^3.2.0",
     "toastr": "^2.1.3",
     "angular-bootstrap": "^2.5.0",
     "jqGrid": "^5.2.0",
     "Autocomplete": "autocomplete#^2.0.5",
     "DataTables": "~1.10.15",
     "angular-cookies": "~1.6.4",
     "angular-resource": "~1.6.4",
     "angular-xeditable": "~0.7.1",
-    "angular-bootstrap-toggle": "~0.1.2"
+    "angular-bootstrap-toggle": "~0.1.2",
+    "angular-ui-select2": "^0.0.5"
   }
 }