Skip to content

Commit

Permalink
+ Refactored a bit
Browse files Browse the repository at this point in the history
+ Updated composer packages
+ Removed unnecessary package
  • Loading branch information
faizanakram99 committed Jan 16, 2018
1 parent 852c33e commit b71d2db
Show file tree
Hide file tree
Showing 9 changed files with 444 additions and 1,363 deletions.
4 changes: 0 additions & 4 deletions assets/css/styles.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 0 additions & 4 deletions assets/css/styles.scss
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,4 @@ form.form-inline {
border: 1px solid red;
}
}
}

#imagecontainer{
display: none;
}
20 changes: 10 additions & 10 deletions assets/js/scripts.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,17 @@ angular.module("reportsApp", ['ngResource', 'moment-picker'])
$scope.refresh = true;

const Report = $resource('/web/app.php/:date', {date: '@date'});
const getReport = () => Report.get({date: $scope.date}, (report) => $scope.report = report);
const getReport = () => Report.get({date: $scope.date});

$scope.$watch('currentdate', (newval) => {
$scope.date = moment(newval).format("YYYY-MM-DD");
$scope.dateText = moment(newval).format("MMM Do YYYY");
if($scope.refresh) getReport();
});
$scope.changeDate = () => {
$scope.date = moment($scope.currentdate).format("YYYY-MM-DD");
$scope.dateText = moment($scope.currentdate).format("MMM Do YYYY");
if($scope.refresh) $scope.report = getReport();
}

$scope.toggleEmail = () => !($scope.report.reportdetails && $scope.report.reportdetails.find(x => x && !x.id));
$scope.changeDate();

$scope.$watch('report.login + report.logout', () => $scope.workhours = `${$scope.report.login} - ${$scope.report.logout}`);
$scope.toggleEmail = () => !($scope.report.reportdetails && $scope.report.reportdetails.find(x => x && !x.id));

$scope.add = (index) => {
$scope.report.reportdetails.push({});
Expand All @@ -29,14 +29,14 @@ angular.module("reportsApp", ['ngResource', 'moment-picker'])

$scope.save = () => {
Report.save({date: $scope.date}, JSON.stringify($scope.report), (response) => {
getReport();
$scope.report = getReport();
alert(response.message);
}, (error) => console.log(error));
};

$scope.delete = () => {
Report.delete({date: $scope.date}, (response) => {
getReport();
$scope.report = getReport();
alert(response.message);
}, (error) => console.log(error));
};
Expand Down
5 changes: 4 additions & 1 deletion bootstrap.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,10 @@
echo json_encode($e->getMessage());
}

$twigLoader = new Twig_Loader_Filesystem(__DIR__.'/src/templates');
$twig = new Twig_Environment($twigLoader);

/** @var Request $request */
$request = Request::createFromGlobals();

$report = new Api\Report($em);
$report = new Api\Report($em, $twig);
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"doctrine/orm": "^2.5",
"symfony/yaml": "^3.4",
"symfony/http-foundation": "^3.4",
"sensio/framework-extra-bundle": "^5.1"
"twig/twig": "@stable"
},
"scripts": {
"post-autoload-dump": "vendor/bin/doctrine orm:schema-tool:update --force --dump-sql"
Expand Down
Loading

0 comments on commit b71d2db

Please sign in to comment.