Skip to content

Commit

Permalink
Merge pull request #43 from bharatdwarkani/development
Browse files Browse the repository at this point in the history 
merge from development to master
  • Loading branch information
@bharatdwarkani
bharatdwarkani authored Apr 7, 2018
2 parents d2ae84f + 249c0ec commit 52e0443
Show file tree
Hide file tree
Showing 7 changed files with 82 additions and 102 deletions.
17 changes: 5 additions & 12 deletions TaskPlanner/Views/Project/Projects.cshtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,24 +75,17 @@
#addButton {
display: block !important;
float: right;
font-size: 14px;
height: 30px;
margin-bottom: 5px;
margin-top: 10px;
border: 0;
background: #4285f6;
box-shadow: none;
border-radius: 0px;
color: white;
}
.e-btn.e-flat {
color: #757575 !important;
}
.e-btn.e-flat.e-primary {
color: #ad5393 !important;
}
.fa, .glyphicon {
color: rgba(0,0,0,.54);
Expand Down Expand Up @@ -133,7 +126,7 @@


<div id="target">
<button id="addButton" onclick="myFunction()" style="margin-bottom:10px">Add Project</button>
<button id="addButton" class="e-css e-btn e-primary" onclick="myFunction()" style="margin-bottom:10px">ADD PROJECT</button>
</div>
<div id="projectmodalDialog">

Expand Down
2 changes: 1 addition & 1 deletion TaskPlanner/Views/Project/_ShareProject.cshtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
</div>
</div>
<div class='col-sm-2'>
<button style="float: right; background-color: #4285f6" type="submit" id="sharebtn">ADD</button>
<button style="float: right;" class="e-css e-btn e-primary" type="submit" id="sharebtn">ADD</button>
</div>
</div>
</form>
Expand Down
8 changes: 5 additions & 3 deletions TaskPlanner/Views/Shared/_Layout.cshtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
<environment include="Development">
<link rel="stylesheet" href="~/lib/bootstrap/dist/css/bootstrap.css" />
<link rel="stylesheet" href="~/css/site.css" />
<link href="~/css/ej2/material.css" rel="stylesheet" />
@*<link href="~/css/ej2/material.css" rel="stylesheet" />*@
<link href="https://cdn.syncfusion.com/ej2/16.1.28/ej2-grids/styles/material.css" rel="stylesheet">
<link href="~/css/Plugin/toastr.css" rel="stylesheet" />
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.5.0/css/font-awesome.min.css">
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
Expand All @@ -20,13 +21,14 @@
<link rel="stylesheet" href="~/css/site.min.css" asp-append-version="true" />
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.5.0/css/font-awesome.min.css">
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
<link href="~/dist/cssminify/ej2.min.css" rel="stylesheet" asp-append-version="true" />
@*<link href="~/dist/cssminify/ej2.min.css" rel="stylesheet" asp-append-version="true" />*@
<link href="https://cdn.syncfusion.com/ej2/16.1.28/ej2-grids/styles/material.css" rel="stylesheet">
</environment>
<link href="~/css/icons.css" rel="stylesheet" />
</head>
<body id="targetbody">
<div id="progressDialogModal">
<i class="loading-icon fa fa-refresh fa-spin fa-lg"></i>
<i class="loading-icon fa fa-spinner fa-spin fa-lg"></i>
</div>
<nav class="navbar navbar navbar-fixed-top" style="background:white">
<div class="container-fluid">
Expand Down
38 changes: 19 additions & 19 deletions TaskPlanner/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,19 @@
"cheerio": "^1.0.0-rc.1",
"crossroads": "^0.12.2",
"hasher": "^1.2.0",
"@syncfusion/ej2": "15.4.18",
"@syncfusion/ej2-base": "15.4.17",
"@syncfusion/ej2-buttons": "15.4.17",
"@syncfusion/ej2-calendars": "15.4.17",
"@syncfusion/ej2-charts": "15.4.17",
"@syncfusion/ej2-circulargauge": "15.4.17",
"@syncfusion/ej2-compression": "15.4.17",
"@syncfusion/ej2-dropdowns": "15.4.17",
"@syncfusion/ej2-grids": "15.4.18",
"@syncfusion/ej2-inputs": "15.4.17",
"@syncfusion/ej2-lists": "15.4.17",
"@syncfusion/ej2-navigations": "15.4.17",
"@syncfusion/ej2-popups": "15.4.17"
"@syncfusion/ej2": "16.1.33",
"@syncfusion/ej2-base": "16.1.33",
"@syncfusion/ej2-buttons": "16.1.32",
"@syncfusion/ej2-calendars": "16.1.33",
"@syncfusion/ej2-charts": "16.1.32",
"@syncfusion/ej2-circulargauge": "16.1.32",
"@syncfusion/ej2-compression": "16.1.32",
"@syncfusion/ej2-dropdowns": "16.1.33",
"@syncfusion/ej2-grids": "16.1.33",
"@syncfusion/ej2-inputs": "16.1.32",
"@syncfusion/ej2-lists": "16.1.32",
"@syncfusion/ej2-navigations": "16.1.32",
"@syncfusion/ej2-popups": "16.1.32"
},
"devDependencies": {
"@types/chai": "^3.4.28",
Expand All @@ -38,12 +38,12 @@
"@types/requirejs": "^2.1.26",
"@types/signals": "0.0.16",
"del": "^3.0.0",
"gulp": "^3.9.1",
"gulp-clean": "0.3.2",
"gulp-clean-css": "3.9.0",
"gulp-concat": "^2.6.1",
"gulp-cssmin": "^0.2.0",
"gulp-htmlmin": "^3.0.0",
"gulp": "3.9.1",
"gulp-clean": "0.4.0",
"gulp-clean-css": "3.9.3",
"gulp-concat": "2.6.1",
"gulp-cssmin": "0.2.0",
"gulp-htmlmin": "4.0.0",
"gulp-load-plugins": "1.5.0",
"gulp-sass": "3.1.0",
"gulp-sourcemaps": "2.6.1",
Expand Down
6 changes: 1 addition & 5 deletions TaskPlanner/wwwroot/js/ej2/ej2.config.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
}
},
paths: {
"syncfusion:": "https://cdn.syncfusion.com/ej2/15.4.23/",
"syncfusion:": "https://cdn.syncfusion.com/ej2/16.1.28/",
},
map: {
typescript: "https://unpkg.com/[email protected]/lib/typescript.js",
Expand All @@ -31,9 +31,5 @@
"@syncfusion/ej2-pdf-export": "syncfusion:ej2-pdf-export/dist/ej2-pdf-export.umd.min.js",
"@syncfusion/ej2-compression": "syncfusion:ej2-compression/dist/ej2-compression.umd.min.js",
"@syncfusion/ej2-file-utils": "syncfusion:ej2-file-utils/dist/ej2-file-utils.umd.min.js",
"@common/confirmdialog": "ts/Common/ConfirmDialog.ts",
"@common/alertdialog": "ts/Common/AlertDialog.ts",
"@common/validationmessages": "ts/Common/ValidationMessages.ts",
"@common/utils": "ts/Common/Utils.ts"
}
});
109 changes: 49 additions & 60 deletions TaskPlanner/wwwroot/ts/Stories/Stories.ts
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import { enableRipple } from '@syncfusion/ej2-base';
import { DataManager, UrlAdaptor } from '@syncfusion/ej2-data';
import { DropDownList } from '@syncfusion/ej2-dropdowns';
import { ColumnChooser, ContextMenu, Filter, Grid, Page, Pager, ColumnMenu, QueryCellInfoEventArgs, PdfExport, RowDataBoundEventArgs, Sort, SortEventArgs, Toolbar, ExcelExport, Group, FilterType, Resize, Edit,Reorder } from '@syncfusion/ej2-grids';
import { Filter, Grid, Page, Pager, QueryCellInfoEventArgs, RowDataBoundEventArgs, Sort, SortEventArgs, Toolbar, ExcelExport, Group, FilterType, Resize, ColumnChooser, Edit, ColumnMenu } from '@syncfusion/ej2-grids';
import { Dialog } from '@syncfusion/ej2-popups';
import { ClickEventArgs } from '@syncfusion/ej2-navigations';
enableRipple(true);
Grid.Inject(ColumnChooser, Sort, Page, ContextMenu, Filter, Toolbar, ExcelExport, PdfExport, Group, Resize, Edit, ColumnMenu, Reorder );
Grid.Inject(Sort, Page, Filter, Toolbar, ExcelExport, Group, Resize, ColumnChooser, Edit, ColumnMenu );
let progressModel: HTMLInputElement = document.getElementById('progressDialogModal') as HTMLInputElement;

let projectId = $("#projectId").val();
Expand All @@ -29,70 +29,62 @@ let storiesList: Grid = new Grid({
actionBegin: actionBegin,
actionComplete: actionComplete,
allowExcelExport: true,
allowPdfExport:false,
allowPaging: false,
allowGrouping: true,
allowSorting: true,
allowFiltering: true,
allowResizing: true,
allowTextWrap: true,
showColumnMenu: true,
filterSettings: { type: 'checkbox' },
toolbar: ['excelexport', 'search', 'columnchooser', 'add', 'edit', 'delete', 'update', 'cancel'],
filterSettings: { type: 'CheckBox' },
toolbar: ['ExcelExport', 'Search', 'ColumnChooser', 'Add', 'Edit', 'Delete', 'Update', 'Cancel'],
showColumnChooser: true,
allowResizing: true,
allowMultisorting: true,
//allowReordering: true,
enablePersistence: true,
contextMenuItems: ['autoFit', 'autoFitAll', 'sortAscending', 'sortDescending',
'copy', 'edit', 'delete', 'save', 'cancel','excelExport', 'csvExport', ],
editSettings: { allowEditing: true, allowAdding: true, allowDeleting: true, mode: 'normal' },
showColumnMenu: true,
//enablePersistence: true,
editSettings: { allowEditing: true, allowAdding: true, allowDeleting: true, mode: 'Normal' },
groupSettings: { showDropArea: true },
columns: [
{ field: 'SortOrder', headerText: 'Sort Order', type: "number", visible: false },
{ field: 'StoryId', headerText: 'Story ID', showInColumnChooser: false, isPrimaryKey: true, type: "number", visible: false },
{ field: 'TaskId', headerText: 'Task ID', type: "number", visible: false },
{ field: 'Title', headerText: 'Title',width:'200px' , type: "string", validationRules: { required: true } },
{ field: 'ThemeName', headerText: 'Theme', type: "string" },
{ field: 'EpicName', headerText: 'Epic', type: "string" },
{ field: 'StoryPoints', headerText: 'Estimate', type: "number" },
{ field: 'Milestone', headerText: 'Milestone', type: "string", visible: false },
{ field: 'Benifit', headerText: 'Benefit', type: "number", visible: true },
{ field: 'Penalty', headerText: 'Penalty', type: "number", visible: true },
{ field: 'Priority', headerText: 'Priority', type: "string", visible: true },
{ field: 'Release', headerText: 'Release', type: "string", visible: false },
{ field: 'Status', headerText: 'Status', type: "string", visible: true },
//{
// field: 'Status', headerText: 'Status', type: "string", width: 150, visible: true, edit: {
// create: () => {
// statusElem = document.createElement('input');
// return statusElem;
// },
// read: () => {
// return statusObj.text;
// },
// destroy: () => {
// if (statusObj)
// statusObj.destroy();
// },
// write: () => {
// statusObj = new DropDownList({
// dataSource: status,
// fields: { value: 'statusId', text: 'statusName' },
// placeholder: 'Select status',
// floatLabelType: 'Never'
// });
// statusObj.appendTo(statusElem);
// }
// }
//},
{ field: 'SprintName', headerText: 'Sprint', type: "string", visible: false },
{ field: 'AssigneeName', headerText: 'Assignee', type: "string", visible: false },
{ field: 'Tag', headerText: 'Label', type: "string", visible: false }
{ field: 'SortOrder', headerText: 'Sort Order', type: "number", visible: false, clipMode: 'EllipsisWithTooltip'},
{ field: 'StoryId', headerText: 'Story ID', showInColumnChooser: false, isPrimaryKey: true, type: "number", visible: false, clipMode: 'EllipsisWithTooltip' },
{ field: 'TaskId', headerText: 'Task ID', type: "number", visible: false, clipMode: 'EllipsisWithTooltip'},
{ field: 'Title', headerText: 'Title', width: '150px', type: "string", validationRules: { required: true } ,clipMode: 'EllipsisWithTooltip'},
{ field: 'ThemeName', headerText: 'Theme', type: "string", clipMode: 'EllipsisWithTooltip' },
{ field: 'EpicName', headerText: 'Epic', type: "string", clipMode: 'EllipsisWithTooltip' },
{ field: 'StoryPoints', headerText: 'Estimate', type: "number", clipMode: 'EllipsisWithTooltip' },
{ field: 'Milestone', headerText: 'Milestone', type: "string", visible: false, clipMode: 'EllipsisWithTooltip' },
{ field: 'Benifit', headerText: 'Benefit', type: "number", visible: true, clipMode: 'EllipsisWithTooltip' },
{ field: 'Penalty', headerText: 'Penalty', type: "number", visible: true, clipMode: 'EllipsisWithTooltip' },
{ field: 'Priority', headerText: 'Priority', type: "string", visible: true, clipMode: 'EllipsisWithTooltip' },
{ field: 'Release', headerText: 'Release', type: "string", clipMode: 'EllipsisWithTooltip' },
{
field: 'Status', headerText: 'Status', type: "string", width: 150, visible: true, edit: {
create: () => {
statusElem = document.createElement('input');
return statusElem;
},
read: () => {
return statusObj.text;
},
destroy: () => {
statusObj.destroy();
},
write: () => {
statusObj = new DropDownList({
dataSource: status,
fields: { value: 'statusId', text: 'statusName' },
placeholder: 'Select status',
floatLabelType: 'Never'
});
statusObj.appendTo(statusElem);
}
}
},
{ field: 'SprintName', headerText: 'Sprint', type: "string", visible: false, clipMode: 'EllipsisWithTooltip' },
{ field: 'AssigneeName', headerText: 'Assignee', type: "string", visible: false, clipMode: 'EllipsisWithTooltip' },
{ field: 'Tag', headerText: 'Label', type: "string", visible: false, clipMode: 'EllipsisWithTooltip' }
],
created: create,
dataSource: templatedata,
load: load,
dataBound: () => storiesList.autoFitColumns()
//pageSettings: { pageSize: 10 },

});
Expand All @@ -102,22 +94,19 @@ storiesList.toolbarClick = (args: ClickEventArgs) => {
if (args.item.id === 'storiesList_excelexport') {
storiesList.excelExport();
}
if (args.item.id === 'storiesList_pdfExport') {
storiesList.pdfExport();
}
};


function load(): void {
// progressModel.style.cssText = "display : block";
progressModel.style.cssText = "display : block";
}

function create(): void {
progressModel.style.cssText = "display : none";
}

function actionBegin(args): void {
// progressModel.style.cssText = "display : block";
progressModel.style.cssText = "display : block";
if (args.requestType == "save") {
$.ajax({
data: {
Expand Down Expand Up @@ -148,7 +137,7 @@ function actionBegin(args): void {
});
}
else if (args.requestType == "delete") {
var confirm = (<any>window).confirm("Are you sure you want to delete selected story? Once deleted it cannot be recovered.");
var confirm = (<any>window).confirm("Are you sure you want to delete the selected story? Once deleted it cannot be recovered.");
if (!confirm)
return false;

Expand Down
4 changes: 2 additions & 2 deletions TaskPlanner/wwwroot/ts/projects.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ function loadprojectsTab(projectId) {
},
{
click: addButtonClick,
buttonModel: { id: 'addprojectAddbutton', content: 'Update', cssClass: 'e-flat', isPrimary: true },
buttonModel: { id: 'addprojectAddbutton', content: 'Update', cssClass: 'e-flat dlg-btn-primary', isPrimary: true },
}],
open: addMilestonedialogOpen,
});
Expand Down Expand Up @@ -396,7 +396,7 @@ function loadprojectsTab(projectId) {


sharedialogObj.id = id;
let button = new Button({ cssClass: 'e-success' });
let button = new Button();
button.appendTo('#sharebtn');
let projectNameContainer = document.getElementById('shareEmail') as HTMLInputElement;
projectNameContainer.value = "";
Expand Down

0 comments on commit 52e0443

Please sign in to comment.