Error or warning message in manage projects view screen (#101)

src/main/webapp/WEB-INF/controllers/ProjectController.js

@@ -1001,7 +1001,7 @@ myApp.controller("projectController", function ($scope, myFactory, exportUiGridS
 	            else if(action =="Add" && ($scope.newBillingStartDate > $scope.endDate)){
 	          		 $scope.alertMsg = "Assignment End Date should be less than New Billability Start Date ";
 	           		}
-	            else if(action == "Update" && ($scope.endDate < $scope.startDate < $scope.newBillingStartDate)){
+				else if (action == "Update" && (($scope.endDate < $scope.startDate) && ($scope.startDate <= $scope.newBillingStartDate) && ($scope.endDate < $scope.newBillingStartDate))) {
 	            	$scope.alertMsg  = "EndDate should be greater than StartDate and new BillingStartDate ";
 	            }
 				else if(employeeModel != undefined && projectModel != undefined && action == "Add"
@@ -1174,8 +1174,24 @@ myApp.controller("projectController", function ($scope, myFactory, exportUiGridS
 			$mdDialog.hide('Cancelled');
 		       };
 		
-		$scope.cancelTab = function() {
-		    removeTab("cancel");
+		$scope.cancelTab = function () {
+			if (dataToPass.action == "View") {
+				if ($scope.myForm.$dirty) {
+					$mdDialog.show($mdDialog.confirm({
+						skipHide: true,
+						textContent: 'Are you sure you want to cancel this?',
+						ok: 'ok',
+						cancel: 'cancel'
+					})).then(function () {
+						removeTab("cancel");
+						$scope.myForm.$setPristine();
+					})
+				}
+				else {
+					removeTab("cancel")
+
+				}
+			}
 		};
 		
 		$scope.getEmployeeSelected = function(){