Commit 1b16f1cd authored by NISUM's avatar NISUM

resolved bugs and excel sheet

parent 80aed22b
...@@ -156,7 +156,7 @@ myApp.controller("domainController", ...@@ -156,7 +156,7 @@ myApp.controller("domainController",
showAlert('Domain updated successfully'); showAlert('Domain updated successfully');
} else if (result == "Cancelled") } else if (result == "Cancelled")
console.log(result); console.log(result);
else else
showAlert('Domain assigning/updation failed!!!'); showAlert('Domain assigning/updation failed!!!');
}); });
}; };
...@@ -385,7 +385,7 @@ myApp.controller("domainController", ...@@ -385,7 +385,7 @@ myApp.controller("domainController",
updateGrid("Add", result); updateGrid("Add", result);
} else if (response.message == "Domain has been updated") { } else if (response.message == "Domain has been updated") {
updateGrid("Update", result); updateGrid("Update", result);
} else if (response.message == "Domain already existed") { } else if (response.message == "Domain is already existed") {
$scope.alertMsg = "Domain already exist,Please enter new matching"; $scope.alertMsg = "Domain already exist,Please enter new matching";
} }
...@@ -458,7 +458,7 @@ myApp.controller("domainController", ...@@ -458,7 +458,7 @@ myApp.controller("domainController",
$scope.alertMsg = "Please enter alphabets only"; $scope.alertMsg = "Please enter alphabets only";
document.getElementById('domainName').focus(); document.getElementById('domainName').focus();
}else if(deliveryManagers.length <= 0){ }else if(deliveryManagers.length <= 0){
$scope.alertMsg = "Please select a deliveryManagers"; $scope.alertMsg = "Please select a delivery Lead";
document.getElementById('selectDeliveryLeads').focus(); document.getElementById('selectDeliveryLeads').focus();
}else { }else {
$scope.alertMsg = ""; $scope.alertMsg = "";
...@@ -485,7 +485,7 @@ myApp.controller("domainController", ...@@ -485,7 +485,7 @@ myApp.controller("domainController",
$scope.alertMsg = "Please enter alphabets only"; $scope.alertMsg = "Please enter alphabets only";
document.getElementById('domainName').focus(); document.getElementById('domainName').focus();
}else if(deliveryManagers.length <= 0){ }else if(deliveryManagers.length <= 0){
$scope.alertMsg = "Please select a deliveryManagers"; $scope.alertMsg = "Please select a delivery Lead";
document.getElementById('selectDeliveryLeads').focus(); document.getElementById('selectDeliveryLeads').focus();
}else { }else {
$scope.alertMsg = ""; $scope.alertMsg = "";
......
...@@ -22,12 +22,12 @@ myApp.controller("myProjectAllocationsController",function($scope, myFactory, $m ...@@ -22,12 +22,12 @@ myApp.controller("myProjectAllocationsController",function($scope, myFactory, $m
paginationPageSizes : [ 10, 20, 30, 40, 50, 100], paginationPageSizes : [ 10, 20, 30, 40, 50, 100],
paginationPageSize : 10, paginationPageSize : 10,
pageNumber: 1, pageNumber: 1,
pageSize:10, pageSize:10,
enableFiltering:true, enableFiltering:true,
columnDefs : [ columnDefs : [
{field : 'projectName',displayName: 'Project',cellTemplate:getCellTemplate, enableColumnMenu: true, enableSorting: true,enableFiltering:true}, {field : 'projectName',displayName: 'Project',cellTemplate:getCellTemplate, enableColumnMenu: true, enableSorting: true,enableFiltering:true},
{field : 'account',displayName: 'Account', enableColumnMenu: false, enableSorting: false,enableFiltering:true}, {field : 'account',displayName: 'Account', enableColumnMenu: false, enableSorting: false,enableFiltering:true},
{field : 'deliveryLeadIds',displayName: 'Delivery Lead',cellTemplate:'<div ng-repeat= "item in row.entity[col.field]">{{item.employeeName}}<span ng-hide="$last">,</span></div>', enableColumnMenu: false, enableSorting: false,enableFiltering:true}, {field : 'deliveryLeadIds',displayName: 'Delivery Lead',cellTemplate:'<div ng-repeat= "item in row.entity[col.field]">{{item.employeeName}}<span ng-hide="$last">,</span></div>', enableColumnMenu: false, enableSorting: false,enableFiltering:false},
{field : 'billableStatus',displayName: 'Billability', enableColumnMenu: false, enableSorting: false,enableFiltering:false}, {field : 'billableStatus',displayName: 'Billability', enableColumnMenu: false, enableSorting: false,enableFiltering:false},
{field : 'projectStartDate',displayName: 'Start Date', enableColumnMenu: false, enableSorting: false,cellFilter: 'date:"dd-MMM-yyyy"',enableFiltering:false}, {field : 'projectStartDate',displayName: 'Start Date', enableColumnMenu: false, enableSorting: false,cellFilter: 'date:"dd-MMM-yyyy"',enableFiltering:false},
{field : 'projectEndDate',displayName: 'End Date', enableColumnMenu: false, enableSorting: false,cellFilter: 'date:"dd-MMM-yyyy"',enableFiltering:false}, {field : 'projectEndDate',displayName: 'End Date', enableColumnMenu: false, enableSorting: false,cellFilter: 'date:"dd-MMM-yyyy"',enableFiltering:false},
......
...@@ -490,4 +490,39 @@ md-toolbar._md-toolbar-transitions { ...@@ -490,4 +490,39 @@ md-toolbar._md-toolbar-transitions {
content: " *"; content: " *";
color: red; color: red;
font-size: 15px; font-size: 15px;
}
md-select-header.selectHeaderChild {
position: relative
}
md-select-header input.searchBoxHeader {
padding: 8px;
margin: 8px;
position: relative;
}
.close-mdselect {
position: absolute;
right: 18px;
top: 22px;
}
.optionScroll{
margin-top:0px;
}
.selectHeader .md-content._md {
max-height: 240px;
}
.md-dialog-container {
z-index: 100 !important;
}
.md-select-menu-container {
z-index: 100 !important;
}
.md-dialog-custom-height {
max-height: 95% !important;
}
.md-content{
height: 1100px !important;
}
.md-datepicker-is-showing .md-scroll-mask {
position: fixed;
z-index: inherit;
} }
\ No newline at end of file
/*
* FileSaver.js
* A saveAs() FileSaver implementation.
*
* By Eli Grey, http://eligrey.com
*
* License : https://github.com/eligrey/FileSaver.js/blob/master/LICENSE.md (MIT)
* source : http://purl.eligrey.com/github/FileSaver.js
*/
// The one and only way of getting global scope in all environments
// https://stackoverflow.com/q/3277182/1008999
var _global = typeof window === 'object' && window.window === window
? window : typeof self === 'object' && self.self === self
? self : typeof global === 'object' && global.global === global
? global
: this
function bom (blob, opts) {
if (typeof opts === 'undefined') opts = { autoBom: false }
else if (typeof opts !== 'object') {
console.warn('Deprecated: Expected third argument to be a object')
opts = { autoBom: !opts }
}
// prepend BOM for UTF-8 XML and text/* types (including HTML)
// note: your browser will automatically convert UTF-16 U+FEFF to EF BB BF
if (opts.autoBom && /^\s*(?:text\/\S*|application\/xml|\S*\/\S*\+xml)\s*;.*charset\s*=\s*utf-8/i.test(blob.type)) {
return new Blob([String.fromCharCode(0xFEFF), blob], { type: blob.type })
}
return blob
}
function download (url, name, opts) {
var xhr = new XMLHttpRequest()
xhr.open('GET', url)
xhr.responseType = 'blob'
xhr.onload = function () {
saveAs(xhr.response, name, opts)
}
xhr.onerror = function () {
console.error('could not download file')
}
xhr.send()
}
function corsEnabled (url) {
var xhr = new XMLHttpRequest()
// use sync to avoid popup blocker
xhr.open('HEAD', url, false)
xhr.send()
return xhr.status >= 200 && xhr.status <= 299
}
// `a.click()` doesn't work for all browsers (#465)
function click(node) {
try {
node.dispatchEvent(new MouseEvent('click'))
} catch (e) {
var evt = document.createEvent('MouseEvents')
evt.initMouseEvent('click', true, true, window, 0, 0, 0, 80,
20, false, false, false, false, 0, null)
node.dispatchEvent(evt)
}
}
var saveAs = _global.saveAs || (
// probably in some web worker
(typeof window !== 'object' || window !== _global)
? function saveAs () { /* noop */ }
// Use download attribute first if possible (#193 Lumia mobile)
: 'download' in HTMLAnchorElement.prototype
? function saveAs (blob, name, opts) {
var URL = _global.URL || _global.webkitURL
var a = document.createElement('a')
name = name || blob.name || 'download'
a.download = name
a.rel = 'noopener' // tabnabbing
// TODO: detect chrome extensions & packaged apps
// a.target = '_blank'
if (typeof blob === 'string') {
// Support regular links
a.href = blob
if (a.origin !== location.origin) {
corsEnabled(a.href)
? download(blob, name, opts)
: click(a, a.target = '_blank')
} else {
click(a)
}
} else {
// Support blobs
a.href = URL.createObjectURL(blob)
setTimeout(function () { URL.revokeObjectURL(a.href) }, 4E4) // 40s
setTimeout(function () { click(a) }, 0)
}
}
// Use msSaveOrOpenBlob as a second approach
: 'msSaveOrOpenBlob' in navigator
? function saveAs (blob, name, opts) {
name = name || blob.name || 'download'
if (typeof blob === 'string') {
if (corsEnabled(blob)) {
download(blob, name, opts)
} else {
var a = document.createElement('a')
a.href = blob
a.target = '_blank'
setTimeout(function () { click(a) })
}
} else {
navigator.msSaveOrOpenBlob(bom(blob, opts), name)
}
}
// Fallback to using FileReader and a popup
: function saveAs (blob, name, opts, popup) {
// Open a popup immediately do go around popup blocker
// Mostly only available on user interaction and the fileReader is async so...
popup = popup || open('', '_blank')
if (popup) {
popup.document.title =
popup.document.body.innerText = 'downloading...'
}
if (typeof blob === 'string') return download(blob, name, opts)
var force = blob.type === 'application/octet-stream'
var isSafari = /constructor/i.test(_global.HTMLElement) || _global.safari
var isChromeIOS = /CriOS\/[\d]+/.test(navigator.userAgent)
if ((isChromeIOS || (force && isSafari)) && typeof FileReader === 'object') {
// Safari doesn't allow downloading of blob URLs
var reader = new FileReader()
reader.onloadend = function () {
var url = reader.result
url = isChromeIOS ? url : url.replace(/^data:[^;]*;/, 'data:attachment/file;')
if (popup) popup.location.href = url
else location = url
popup = null // reverse-tabnabbing #460
}
reader.readAsDataURL(blob)
} else {
var URL = _global.URL || _global.webkitURL
var url = URL.createObjectURL(blob)
if (popup) popup.location = url
else location.href = url
popup = null // reverse-tabnabbing #460
setTimeout(function () { URL.revokeObjectURL(url) }, 4E4) // 40s
}
}
)
_global.saveAs = saveAs.saveAs = saveAs
if (typeof module !== 'undefined') {
module.exports = saveAs;
}
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/normalize/5.0.0/normalize.min.css"></link> <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/normalize/5.0.0/normalize.min.css"></link>
<link href="http://ajax.googleapis.com/ajax/libs/jqueryui/1.10.3/themes/smoothness/jquery-ui.min.css" rel="stylesheet"> <link href="http://ajax.googleapis.com/ajax/libs/jqueryui/1.10.3/themes/smoothness/jquery-ui.min.css" rel="stylesheet">
<script src="js/pdf/pdf.js"></script> <script src="js/pdf/pdf.js"></script>
<script src='js/FileSaver.js'></script>
<script src="js/pdf/angular-pdf.min.js"></script> <script src="js/pdf/angular-pdf.min.js"></script>
<script src="js/pdf/print.min.js"></script> <script src="js/pdf/print.min.js"></script>
<link rel="stylesheet" href="css/bootstrap.min.css"></link> <link rel="stylesheet" href="css/bootstrap.min.css"></link>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment