Subversion Repositories SmartDukaan

Rev

Rev 27884 | Rev 27887 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 27884 Rev 27886
Line 663... Line 663...
663 
                    <ul class="sub">
 663 
                    <ul class="sub">
664 
                        <li><a class="item-ledger-report-download-page" href="javascript:void(0);">Download</a></li>
 664 
                        <li><a class="item-ledger-report-download-page" href="javascript:void(0);">Download</a></li>
665 
                    </ul>
 665 
                    </ul>
666 
                </li>
 666 
                </li>
667 
 
 667 
 
668 
<<<<<<< .mine
 - 
 
669 
	<!--main content start-->
 - 
 
670 
	<section id="main-content">
 - 
 
671 
		<section class="wrapper">
 - 
 
672 
          	<!--overview start-->
 - 
 
673 
			<div class="row">
 - 
 
674 
				<div class="col-lg-12">
 - 
 
675 
					<h3 class="page-header"><i class="fa fa-laptop"></i> Dashboard</h3>
 - 
 
676 
					<ol class="breadcrumb">
 - 
 
677 
						<li><i class="fa fa-home"></i><a href="${rc.contextPath}/dashboard">Home</a></li>
 - 
 
678 
						<li><i class="fa fa-laptop"></i>Dashboard</li>
- 
 
679 
					</ol>
 - 
 
680 
				</div>
 - 
 
681 
			</div>
 - 
 
682 
			<!-- overview end -->
 - 
 
683 
			<div class="row">
 - 
 
684 
				<div class="col-lg-6">
 - 
 
685 
					<div class="row">
 - 
 
686 
						<div class="col-lg-7">
 - 
 
687 
							<div class="info-box blue-bg">
 - 
 
688 
								<i class="fa fa-chart-line"></i>
 - 
 
689 
								<h3 style="margin-top:-2px;margin-bottom:12px"><strong>Sale</strong></h3>
 - 
 
690 
								<div class="row">
 - 
 
691 
									<div class="col-lg-4 row">
 - 
 
692 
										<div style="margin-top:0px" class="count currency">$salesMap.get("lmtdSale")</div>
 - 
 
693 
										<div class="title">LMTD</div>
- 
 
694 
									</div>
- 
 
695 
									<div class="col-lg-4 row">
 - 
 
696 
										<div style="margin-top:0px" class="count currency">$salesMap.get("mtdSale")</div>
 - 
 
697 
										<div class="title">MTD</div>
- 
 
698 
									</div>
- 
 
699 
									<div class="col-lg-3 row">
 - 
 
700 
										<div style="margin-top:0px" class="count currency">$salesMap.get("todaySale")</div>
 - 
 
701 
										<div class="title">Today&apos;s</div>
 - 
 
702 
									</div>
 - 
 
703
- 
 
704 
									<div class="col-lg-1 row" style="margin-left: -20px;margin-top: 20px;">
 - 
 
705 
										<i class="fk_more fa fa-angle-double-down" id="blue-dropdown" style="cursor:pointer;font-size: 27px;width: 27px;height: 27px;margin-top: 0px;color: rgba(255, 255, 255, 0.75);line-height: 27px;"></i>
 - 
 
706 
									</div>
- 
 
707 
						       	</div>
 - 
 
708
- 
 
709 
								<div class="row monthsaleContainer" style="margin:5px">
 - 
 
710 
								</div>
- 
 
711 
							</div>
 - 
 
712 
						</div>
 - 
 
713 
						<div class="col-lg-5 row">
 - 
 
714 
							<div class="info-box brown-bg">
 - 
 
715
- 
 
716 
								<div class="col-lg-12">
 - 
 
717 
									<div class="col-lg-6">
 - 
 
718 
									<h4 style="margin-top:-2px;margin-bottom:3px"><strong>Current Rate</strong></h4>
 - 
 
719 
										<div style="margin-top:0px" class="count">
 - 
 
720 
											<span class="currency">$salesMap.get("currentRate")</span>/day
 - 
 
721 
										</div>
 - 
 
722 
										<img src="${salesMap.get('currentTypeImage')}" width="60px" class="target-slide">
 - 
 
723 
									</div>
 - 
 
724 
									<div class="col-lg-6 row">
 - 
 
725 
									<h4 style="margin-top:-2px;margin-bottom:3px"><strong>Reqd Rate</strong></h4>
 - 
 
726 
										<div style="margin-top:0px" class="count currency">
 - 
 
727 
											<span class="currency">$salesMap.get("requiredRate")</span>/day
 - 
 
728 
										</div>
 - 
 
729 
										<img src="${salesMap.get('requiredTypeImage')}" width="60px" class="target-slide">
 - 
 
730 
									</div>
- 
 
731 
								</div>
 - 
 
732 
							</div>
 - 
 
733 
						</div>
 - 
 
734 
						<div class="col-lg-8">
 - 
 
735 
						<div class="info-box purple-bg">
 - 
 
736 
							<div class="col-lg-12 row">
 - 
 
737 
								<i class="fa fa-coins"></i>
 - 
 
738 
								<h3 style="margin-top:-2px;margin-bottom:12px"><strong>Investments</strong></h3>
 - 
 
739 
								<div class="row">
 - 
 
740 
									<div class="col-lg-4 row">
 - 
 
741 
										<div  style="margin-top:0px" class="count currency">$investments.get("today")</div>
 - 
 
742 
										<div class="current">current</div>
- 
 
743 
										<div class="col-lg-1 row" style="margin-left: -20px;margin-top: -6px;">
 - 
 
744 
										<i class="fk_more fa fa-angle-double-down flash" id="purple-dropdown"  style="cursor:pointer;font-size: 27px;width: 145px;height: 27px;margin-top: 0px;color: rgba(255, 255, 255, 0.75);line-height: 4px;"></i>
 - 
 
745 
                                            </div>
- 
 
746 
							    	</div>
- 
 
747
- 
 
748 
									<div class="col-lg-3">
 - 
 
749 
										<div  style="margin-top:0px" class="count">$investments.get("minimum")</div>
 - 
 
750 
										<div class="title">min</div>
- 
 
751 
									</div>
 - 
 
752 
									<div class="col-lg-3 row"
- 
 
753 
									#if(!$isInvestmentOk)
 - 
 
754 
									style="color:mediumvioletred"
 - 
 
755 
									#end
 - 
 
756 
									>
 - 
 
757 
										#if($investments.get("short")<=0)
 - 
 
758 
										<div style="margin-top:0px" class="count">&gt;100%</div>
 - 
 
759 
										<div class="title">OK</div>
 - 
 
760 
										#else
- 
 
761 
										<div style="margin-top:0px" class="count currency">$investments.get("short")%</div>
 - 
 
762 
										<div class="title">short</div>
 - 
 
763 
										#end
 - 
 
764
- 
 
765 
									</div>
 - 
 
766 
								</div>
 - 
 
767 
								<div class="row investmentContainer" style="margin:5px">
 - 
 
768 
								</div>
 - 
 
769 
							</div>
 - 
 
770 
						</div>
 - 
 
771 
					</div>
 - 
 
772 
					<div class="col-lg-4 row">
 - 
 
773 
						<div class="info-box green-bg">
 - 
 
774 
							<i class="fa fa-cubes"></i>
 - 
 
775 
							<div class="count currency">$investments.get("inStock")</div>
 - 
 
776 
							<div class="title">Total Stock</div>
- 
 
777 
						</div>
 - 
 
778 
					</div>
 - 
 
779 
				</div>
 - 
 
780 
				<div class="row">
 - 
 
781 
				<div class="Mobile">
 - 
 
782 
					#foreach($brandStockPrice in $brandStockPrices)
 - 
 
783
- 
 
784 
					<div class="col-lg-3">
 - 
 
785 
						<div class="card card-default">
 - 
 
786 
||||||| .r27798
 - 
 
787 
=======
 - 
 
788 
                <li class="sub-menu">
 668 
                <li class="sub-menu">
789 
                    <a href="javascript:;" class="">
 669 
                    <a href="javascript:;" class="">
790 
                        <i class="icon_table"></i>
 670 
                        <i class="icon_table"></i>
791 
                        <span>Sale</span>
 671 
                        <span>Sale</span>
792 
                        <span class="menu-arrow arrow_carrot-right"></span>
 672 
                        <span class="menu-arrow arrow_carrot-right"></span>
Line 978... Line 858...
978 
							</span>
 858 
							</span>
979 
                                    <span class="card-img">
 859 
                                    <span class="card-img">
980 
								<img src="resources/images/accessories.jpg" id="accesoriesStock"
 860 
								<img src="resources/images/accessories.jpg" id="accesoriesStock"
981 
                                     class="accesoriesClass">
 861 
                                     class="accesoriesClass">
982 
							</span>
 862 
							</span>
983 
 
 - 
 
984 
						</div>
 - 
 
985 
					</div>
 - 
 
986
- 
 
987 
				</div>
 - 
 
988 
				</div>
 - 
 
989
- 
 
990
- 
 
991
- 
 
992 
			</div>
 - 
 
993
- 
 
994 
			<div class="col-lg-6">
 - 
 
995 
				#if($activatedImeis > 0)
 - 
 
996 
					<div class="row col-lg-12 info-box white-bg">
 - 
 
997 
						#parse("dashboard-activated-imeis.vm")
 - 
 
998 
					</div>
 - 
 
999 
				#end
 - 
 
1000 
				#if($sales)
 - 
 
1001 
				#if(!$offers.isEmpty())
 - 
 
1002 
				#foreach( $offer in $offers )
 - 
 
1003 
					<div class="row col-lg-12 info-box white-bg" style="margin-bottom:1px">
 - 
 
1004 
						<h3 style="margin-top:-2px;font-size:17px; margin-bottom:3px;color:#c70db8;font-weight:bold">
 - 
 
1005 
							$offer.getName() - $offer.getStartDateTime() to $offer.getEndDateTime()
 - 
 
1006 
						</h3>
 - 
 
1007 
						    #if($offer.getShortAmount() == 0 && $offer.getAmountType() == "amount" )
 - 
 
1008 
						     <h4 style= "color:green;margin-top:0px;margin-bottom:0px;"> Congratulations you have earn Rs. <span class="currency">$offer.getMargin()</span>. Happy Selling!</h4>
 - 
 
1009
- 
 
1010 
						     #elseif($offer.getShortAmount() == 0 && $offer.getAmountType() == "percentage" )
 - 
 
1011 
						     <h4 style= "color:green;margin-top:0px;margin-bottom:0px;"> Congratulations you have secured $offer.getMargin()%. Happy Selling!</h4>
 - 
 
1012
- 
 
1013 
						     #elseif($offer.getAmountType() == "amount" && $offer.getTargetType()=="value" && $offer.getShortAmount() == $offer.getValue())
 - 
 
1014 
						     <h4 style= "color:green;margin-top:0px;margin-bottom:0px;">
 - 
 
1015 
						      Sell stock worth Rs.<span class="currency">$offer.getShortAmount()</span> to earn additional Rs. <span class="currency">$offer.getMargin()</span>
 - 
 
1016 
						    </h4>
 - 
 
1017
- 
 
1018 
						     #elseif($offer.getAmountType() == "amount" && $offer.getTargetType()=="quantity" && $offer.getShortAmount() == $offer.getValue())
 - 
 
1019 
						     <h4 style= "color:green;margin-top:0px;margin-bottom:0px;">
 - 
 
1020 
						      Sell  <span class="currency">$offer.getShortAmount()</span> units  to earn additional Rs. <span class="currency">$offer.getMargin()</span>
 - 
 
1021 
						    </h4>
 - 
 
1022
- 
 
1023 
						     #elseif($offer.getAmountType() == "percentage" && $offer.getTargetType()=="quantity" && $offer.getShortAmount()== $offer.getValue())
 - 
 
1024 
						       <h4 style= "color:green;margin-top:0px;margin-bottom:0px;">
 - 
 
1025 
							     Sell  <span class="currency">$offer.getShortAmount()</span> units to earn additional $offer.getMargin()%
 - 
 
1026
- 
 
1027 
							  </h4 style= "color:green;margin-top:0px;margin-bottom:0px;">
 - 
 
1028 
						     #elseif($offer.getAmountType() == "percentage" && $offer.getTargetType()=="value" && $offer.getShortAmount() == $offer.getValue())
 - 
 
1029 
					         <h4 style= "color:green;margin-top:0px;margin-bottom:0px;">
 - 
 
1030 
							   Sell stock worth Rs <span class="currency">$offer.getShortAmount()</span>  to earn additional $offer.getMargin()%
 - 
 
1031 
					         </h4>
 - 
 
1032
- 
 
1033 
							#elseif($offer.getAmountType() == "amount" && $offer.getTargetType()=="value" && $offer.getShortAmount() != 0)
 - 
 
1034 
							<h4 style= "color:green;margin-top:0px;margin-bottom:0px;">
 - 
 
1035 
						    Sell stock worth Rs.<span class="currency">$offer.getShortAmount()</span> more to earn additional Rs. <span class="currency">$offer.getMargin()</span>
 - 
 
1036 
						    </h4>
 - 
 
1037 
						    #elseif($offer.getAmountType() == "amount" && $offer.getTargetType()=="quantity" && $offer.getShortAmount() != 0)
 - 
 
1038 
							<h4 style= "color:green;margin-top:0px;margin-bottom:0px;">
 - 
 
1039 
						    Sell <span class="currency">$offer.getShortAmount()</span> unit more to earn additional Rs. <span class="currency">$offer.getMargin()</span>
 - 
 
1040 
						    </h4>
 - 
 
1041 
						    #elseif($offer.getAmountType() == "percentage" && $offer.getTargetType()=="quantity" && $offer.getShortAmount() != 0)
 - 
 
1042 
							<h4 style= "color:green;margin-top:0px;margin-bottom:0px;">
 - 
 
1043 
							Sell  <span class="currency">$offer.getShortAmount()</span> unit more to earn additional $offer.getMargin()%
 - 
 
1044
- 
 
1045 
							</h4>
 - 
 
1046 
							 #elseif($offer.getAmountType() == "percentage" && $offer.getTargetType()=="value" && $offer.getShortAmount() != 0)
 - 
 
1047 
							<h4 style= "color:green;margin-top:0px;margin-bottom:0px;">
 - 
 
1048 
							Sell stock worth Rs<span class="currency">$offer.getShortAmount()</span> more to earn additional $offer.getMargin()%
 - 
 
1049
- 
 
1050 
							</h4>
 - 
 
1051
- 
 
1052 
						   #end
 - 
 
1053
- 
 
1054 
                           <p style="float:right;font-size:15px; margin:0px 0px 0px; " id="description-offer" data-offerid = "$offer.getId()" data-toggle="modal" data-target="#offerDescription"  data-backdrop="static" data-keyboard="false"><a href="#">All terms & conditions</a></p>
 - 
 
1055
- 
 
1056 
					</div>
 - 
 
1057 
					#end
 - 
 
1058 
				#end
 - 
 
1059 
				#end
 - 
 
1060 
				<div class="offer-margin-container">
 - 
 
1061 
		          	<div  class="modal  text-center" id="offerDescription">
 - 
 
1062 
						<div class="modal-dialog">
 - 
 
1063 
						    <div class="modal-content" >
 - 
 
1064 
						    </div>
 - 
 
1065 
						</div>
 - 
 
1066 
					</div>
 - 
 
1067 
				</div>
 - 
 
1068
- 
 
1069 
				<div class="row col-lg-12 info-box white-bg">
 - 
 
1070 
					#parse("performance.vm")
 - 
 
1071 
				</div>
 - 
 
1072 
				<div class="row col-lg-12">
 - 
 
1073 
					<div class="chart-container" id="chart-container" style="position: relative; width:100%">
 - 
 
1074 
						<canvas id="barchart" width="auto" height="auto"></canvas>
- 
 
1075 
					</div>
 - 
 
1076 
				</div>
 - 
 
1077
- 
 
1078 
				</div>
 - 
 
1079 
			</div>
 - 
 
1080 
		</div>
 - 
 
1081 
		</section>
 - 
 
1082 
    	<div class="text-center">
 - 
 
1083 
          <div class="credits">
 - 
 
1084 
          	<p>All rights reserved.&copy;2017, Smart Dukaan</p>
 - 
 
1085 
          </div>
 - 
 
1086 
		</div>
 - 
 
1087
- 
 
1088
- 
 
1089 
		<div id="myChartModal" class="modal fade" role="dialog">
 - 
 
1090 
            <div class="modal-dialog">
 - 
 
1091 
                <!-- Modal content-->
 - 
 
1092 
                <div class="modal-content">
 - 
 
1093
- 
 
1094 
                <div class="modal-footer">
 - 
 
1095 
                        <button type="submit" class="btn btn-default" data-dismiss="modal">Close</button>
 - 
 
1096 
                    </div>
 - 
 
1097 
 
 - 
 
1098
- 
 
1099 
                </div>
 - 
 
1100 
            </div>
 - 
 
1101 
        </div>
 - 
 
1102 
	</section>
 - 
 
1103 
||||||| .r27798
 - 
 
1104 
=======
 - 
 
1105 
                                </div>
 863 
                                </div>
1106 
                            </div>
 864 
                            </div>
1107 
>>>>>>> .r27881
 - 
 
1108 
 
 865 
 
1109 
<<<<<<< .mine
 - 
 
1110 
	<script type="text/javascript">
 - 
 
1111 
		context="${rc.contextPath}";
 - 
 
1112 
		webApiScheme="$webApiScheme";
 - 
 
1113 
		webApiRoot="$webApiRoot";
 - 
 
1114 
		webApiHost="$webApiHost";
 - 
 
1115 
		webApiPort="$webApiPort";
 - 
 
1116 
	</script>
 - 
 
1117 
	#parse("include-scripts.vm")
 - 
 
1118
- 
 
1119 
	<script type="text/javascript">
 - 
 
1120 
   $(document).ready(function(){
 - 
 
1121 
	var salesCloseFlag = true;
 - 
 
1122 
	$("#blue-dropdown").click(function () {
 - 
 
1123 
	        // console.log("clicked");
 - 
 
1124 
	     if(salesCloseFlag) {
 - 
 
1125 
	     	var containerWidth = $(".blue-bg").width()
- 
 
1126 
	     	doGetAjaxRequestHandler(context + "/getMonthSale", function(response) {
 - 
 
1127 
				$('.monthsaleContainer').html(response);
 - 
 
1128 
	       		$(".blue-bg").css({ "position": "absolute","z-index": "10"}).width(containerWidth);
 - 
 
1129 
			});
 - 
 
1130 
		} else {
 - 
 
1131 
            $(".blue-bg").removeAttr('style');
 - 
 
1132 
            $('.monthsaleContainer').html('');
 - 
 
1133 
		}
 - 
 
1134 
		salesCloseFlag = !salesCloseFlag;
 - 
 
1135 
	});
 - 
 
1136 
	});
 - 
 
1137
- 
 
1138 
||||||| .r27798
 - 
 
1139 
=======
 - 
 
1140 
                        </div>
 866 
                        </div>
1141 
                    </div>
 867 
                    </div>
1142 
>>>>>>> .r27881
 - 
 
1143 
$(document).ready(function(){
 - 
 
1144 
	var investmentCloseFlag = true;
 - 
 
1145 
	$("#purple-dropdown").click(function () {
 - 
 
1146 
	console.log('hello');
 - 
 
1147 
	$(".flash").stop();
 - 
 
1148 
	        // console.log("clicked");
 - 
 
1149 
	     if(investmentCloseFlag) {
 - 
 
1150 
	     	var containerWidth = $(".purple-bg").width()
- 
 
1151 
	     	doGetAjaxRequestHandler(context + "/investmentDetails", function(response) {
 - 
 
1152 
				$('.investmentContainer').html(response);
 - 
 
1153 
	       		$(".purple-bg").css({ "position": "absolute","z-index": "10"}).width(containerWidth);
 - 
 
1154 
			});
 - 
 
1155 
		} else {
 - 
 
1156 
            $(".purple-bg").removeAttr('style');
 - 
 
1157 
            $('.investmentContainer').html('');
 - 
 
1158 
		}
 - 
 
1159 
		investmentCloseFlag = !investmentCloseFlag;
 - 
 
1160 
	});
 - 
 
1161 
	});
 - 
 
1162
- 
 
1163 
 
 868 
 
1164 
 
 869 
 
1165 
                </div>
 870 
                </div>
1166 
 
 871 
 
1167 
                <div class="col-lg-6">
 872 
                <div class="col-lg-6">
Line 1184... Line 889...
1184 
                                to earn $offer.getNextTargetSlab().getTargetDescription()
 889 
                                to earn $offer.getNextTargetSlab().getTargetDescription()
1185 
                                #else
 890 
                                #else
1186 
                                Congratulations for achieving the highest slab, you are eligible for $offer.getCurrentTargetSlab().getTargetDescription(), keep up!!
 891 
                                Congratulations for achieving the highest slab, you are eligible for $offer.getCurrentTargetSlab().getTargetDescription(), keep up!!
1187 
                                #end
 892 
                                #end
1188 
                            </h4>
 893 
                            </h4>
1189 
                            <p style="float:right;font-size:15px; margin:0px 0px 0px;" class="description-offer"
 894 
                            <p style="float:right;font-size:15px; margin:0px 0px 0px; " class="description-offer"
1190 
                               data-offerid="$offer.getId()" data-toggle="modal" data-target="#offerDescription"
 895 
                               data-offerid="$offer.getId()" data-toggle="modal" data-target="#offerDescription"
1191 
                               data-backdrop="static" data-keyboard="false"><a href="javascript:void(0)">All terms & conditions</a></p>
 896 
                               data-backdrop="static" data-keyboard="false"><a href="#">All terms & conditions</a></p>
1192 
                        </div>
 897 
                        </div>
1193 
                    #end
 898 
                    #end
1194 
                    <div class="offer-margin-container">
 899 
                    <div class="offer-margin-container">
1195 
                        <div class="modal  text-center" id="offerDescription">
 900 
                        <div class="modal  text-center" id="offerDescription">
1196 
                            <div class="modal-dialog">
 901 
                            <div class="modal-dialog">
Line 1248... Line 953...
1248 
                salesCloseFlag = !salesCloseFlag;
 953 
                salesCloseFlag = !salesCloseFlag;
1249 
            });
 954 
            });
1250 
        });
 955 
        });
1251 
 
 956 
 
1252 
 
 957 
 
1253 
        $(document).on("click", "p.description-offer",
 958 
        $(document).on("click", "#description-offer",
1254 
                function (e) {
 959 
                function (e) {
1255 
                    var offerid = $(this).data('offerid');
 960 
                    var offerid = $(this).data('offerid');
1256 
                    console.log(offerid);
 961 
                    console.log(offerid);
1257 
                    doGetAjaxRequestHandler(context + "/getOfferMargins?offerId="
 962 
                    doGetAjaxRequestHandler(context + "/getOfferMargins?offerId="
1258 
                            + offerid, function (response) {
 963 
                            + offerid, function (response) {
Line 1371... Line 1076...
1371 
								    	<img title="Spice Money" src="/resources/images/icons/provider-logos/spicemoney.jpg" style="width:40px"></img>
 1076 
								    	<img title="Spice Money" src="/resources/images/icons/provider-logos/spicemoney.jpg" style="width:40px"></img>
1372 
								    </a>
 1077 
								    </a>
1373 
								</div>
 1078 
								</div>
1374 
							</div>
 1079 
							</div>
1375 
		    			</div>`,
 1080 
		    			</div>`,
1376 
<<<<<<< .mine
 - 
 
1377 
		    placement: "bottom",
 - 
 
1378 
		    trigger: "focus"
 - 
 
1379 
		});
 - 
 
1380 
	});
 - 
 
1381
- 
 
1382 
	function showAttendanceModal() {
 - 
 
1383 
		var today = new Date().getTime();
 - 
 
1384 
		if ($.cookie("punchIn") == undefined) {
 - 
 
1385 
			document.cookie = "punchIn=" + today;
 - 
 
1386 
		}
 - 
 
1387 
		if (today >= parseInt($.cookie("punchIn"))) {
 - 
 
1388 
			doGetAjaxRequestHandler(context + "/getPunchInOutForModel", function(response) {
 - 
 
1389 
				if(response == 'true'){
 - 
 
1390 
					$('#punchInOutModal').modal('hide');
 - 
 
1391 
					clearInterval(stopInterval);
 - 
 
1392 
				} else{
 - 
 
1393 
			      	$("#punch-in-out-model").html(response);
 - 
 
1394 
					$('#punchInOutModal').modal('show');
 - 
 
1395 
					var time = today + 30 * 60 * 1000
 - 
 
1396 
					document.cookie = "punchIn=" + time;
 - 
 
1397 
				}
 - 
 
1398 
			});
- 
 
1399 
		}
 - 
 
1400 
	}
 - 
 
1401
- 
 
1402 
	var stopInterval;
 - 
 
1403 
	$(document).ready(function(){
 - 
 
1404 
		 stopInterval = setInterval(showAttendanceModal, 100000000);
 - 
 
1405
- 
 
1406 
		 $('div.message-filter').on('click', 'button',function(){
 - 
 
1407
- 
 
1408
- 
 
1409
- 
 
1410 
		 messageType = $(this).data("messagetype");
 - 
 
1411 
	   notifyTypeChange(messageType,$(this));
 - 
 
1412 
	    console.log("messageType"+messageType);
 - 
 
1413
- 
 
1414 
       });
- 
 
1415 
	});
- 
 
1416
- 
 
1417 
||||||| .r27798
 - 
 
1418 
=======
 - 
 
1419 
                placement: "bottom",
 1081 
                placement: "bottom",
1420 
                trigger: "focus"
 1082 
                trigger: "focus"
1421 
            });
 1083 
            });
1422 
        });
 1084 
        });
1423 
>>>>>>> .r27881
 - 
 
1424 
 
 1085 
 
1425 
        function showAttendanceModal() {
 1086 
        function showAttendanceModal() {
1426 
            var today = new Date().getTime();
 1087 
            var today = new Date().getTime();
1427 
            if ($.cookie("punchIn") == undefined) {
 1088 
            if ($.cookie("punchIn") == undefined) {
1428 
                document.cookie = "punchIn=" + today;
 1089 
                document.cookie = "punchIn=" + today;
Line 1530... Line 1191...
1530 
        border: solid 1px black;
 1191 
        border: solid 1px black;
1531 
        border: solid 3px red;
 1192 
        border: solid 3px red;
1532 
        margin-bottom: -14px;
 1193 
        margin-bottom: -14px;
1533 
        color: red;
 1194 
        color: red;
1534 
 
 1195 
 
1535 
 
 - 
 
1536 
color:red;
 - 
 
1537 
border: solid 3px red;
 - 
 
1538 
}
 - 
 
1539 
 
 - 
 
1540 
 
 - 
 
1541 
 
 - 
 
1542 
 
 - 
 
1543 
 
 - 
 
1544 
.notifi.btn-pressed{
 - 
 
1545 
color:black;
 - 
 
1546 
font-size: 17px;
 - 
 
1547 
border: solid 2px black;
 - 
 
1548 
background:white;
 - 
 
1549 
}
 - 
 
1550 
canvas
- 
 
1551 
{	-moz-user-select: none;
 - 
 
1552 
		-webkit-user-select: none;
 - 
 
1553 
		-ms-user-select: none;
 - 
 
1554 
}
 - 
 
1555 
    }
 1196 
    }
1556 
 
 1197 
 
1557 
    .price.btn-pressed {
 1198 
    .price.btn-pressed {
1558 
        color: black;
 1199 
        color: black;
1559 
        background: white;
 1200 
        background: white;