diff --git a/.vscode/launch.json b/.vscode/launch.json index bc7d723..4c0cfff 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -8,7 +8,7 @@ "type": "chrome", "request": "launch", "name": "Launch Chrome", - "url": "http://localhost:4200", + "url": "http://localhost:4201", "webRoot": "${workspaceFolder}" } ] diff --git a/README.md b/README.md index 87dd4e5..0f5e840 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ Run `npm install` to update all packages required locally. ## Development server -Run `ng serve` for a dev server. Navigate to `http://localhost:4200/`. The app will automatically reload if you change any of the source files. +Run `ng serve` for a dev server. Navigate to `http://localhost:4201/`. The app will automatically reload if you change any of the source files. ## Code scaffolding diff --git a/angular.json b/angular.json index 7c199fd..5bf3ae4 100644 --- a/angular.json +++ b/angular.json @@ -93,7 +93,8 @@ "serve": { "builder": "@angular-devkit/build-angular:dev-server", "options": { - "browserTarget": "app:build" + "browserTarget": "app:build", + "port": 4201 }, "configurations": { "production": { diff --git a/e2e/protractor.conf.js b/e2e/protractor.conf.js index 7c798cf..d0f5665 100644 --- a/e2e/protractor.conf.js +++ b/e2e/protractor.conf.js @@ -16,7 +16,7 @@ exports.config = { browserName: 'chrome' }, directConnect: true, - baseUrl: 'http://localhost:4200/', + baseUrl: 'http://localhost:4201/', framework: 'jasmine', jasmineNodeOpts: { showColors: true, @@ -29,4 +29,4 @@ exports.config = { }); jasmine.getEnv().addReporter(new SpecReporter({ spec: { displayStacktrace: true } })); } -}; \ No newline at end of file +}; diff --git a/src/app/how-it-works/how-it-works.component.css b/src/app/how-it-works/how-it-works.component.css index e69de29..7ae303d 100644 --- a/src/app/how-it-works/how-it-works.component.css +++ b/src/app/how-it-works/how-it-works.component.css @@ -0,0 +1,4 @@ +.italic { + font-weight: normal; + font-style: italic; +} diff --git a/src/app/how-it-works/how-it-works.component.html b/src/app/how-it-works/how-it-works.component.html index 7f6da90..a16252f 100644 --- a/src/app/how-it-works/how-it-works.component.html +++ b/src/app/how-it-works/how-it-works.component.html @@ -5,12 +5,12 @@

Introduction

    -
  1. What is the efficiency metric ranking? +
  2. The efficiency metric

    The metric provides an indication of a schools efficiency compared to 49 statistically similar schools based on certain characteristics.

  3. How it is calculated -

    We divide a school's progress score (KS2 or Progress 8) by their per pupil expenditure which allows us to rank the 50 schools and find a their rank. - Progress score / Expenditure per pupil = Efficiency Metric Ranking +

    We divide a school's progress (KS2 or Progress 8) by their per pupil expenditure which gives us a score which allows us to rank the 50 schools. + KS2 progress or Progress 8 / Expenditure per pupil = Efficiency metric score

  4. What you should do with the information @@ -29,7 +29,7 @@

    Introduction

    Back diff --git a/src/app/layouts/gov-uk-layout/footer/footer.component.html b/src/app/layouts/gov-uk-layout/footer/footer.component.html index 9e710f8..195ef9c 100644 --- a/src/app/layouts/gov-uk-layout/footer/footer.component.html +++ b/src/app/layouts/gov-uk-layout/footer/footer.component.html @@ -23,10 +23,8 @@

    Support links

    5. - diff --git a/src/app/metric/em-table/em-table.component.html b/src/app/metric/em-table/em-table.component.html index 24b64c5..3f7c3a3 100644 --- a/src/app/metric/em-table/em-table.component.html +++ b/src/app/metric/em-table/em-table.component.html @@ -75,7 +75,7 @@
    - See ways to improve your school's efficiency metric ranking + See tools to improve your school's efficiency
    diff --git a/src/app/metric/em-table/em-table.component.scss b/src/app/metric/em-table/em-table.component.scss index 106c7aa..7987c53 100644 --- a/src/app/metric/em-table/em-table.component.scss +++ b/src/app/metric/em-table/em-table.component.scss @@ -159,7 +159,7 @@ padding: 5px; a{ - font-size: 14px; + font-size: 16px; font-weight: bold; } } diff --git a/src/app/metric/metric.component.html b/src/app/metric/metric.component.html index 06995a0..e29ac09 100644 --- a/src/app/metric/metric.component.html +++ b/src/app/metric/metric.component.html @@ -1,8 +1,8 @@ - +
    -
    -

    Efficiency Metric Ranking

    +
    +

    Efficiency Metric Ranking

    Results for @@ -10,6 +10,19 @@

    Efficiency Metric Ranking

    +
    +
    + + + Download page + + + + Print page + +
    +
    +
    @@ -26,14 +39,15 @@

    Efficiency Metric Ranking

    -
    +
    -

    Efficiency metric next steps

    -
    diff --git a/src/app/metric/metric.component.scss b/src/app/metric/metric.component.scss index 5cdc0de..a63f8f0 100644 --- a/src/app/metric/metric.component.scss +++ b/src/app/metric/metric.component.scss @@ -39,3 +39,7 @@ } } +.bm-button { + width: 100%; + font-size: 16px; +} diff --git a/src/app/metric/metric.component.ts b/src/app/metric/metric.component.ts index 78b808d..2cd9ee5 100644 --- a/src/app/metric/metric.component.ts +++ b/src/app/metric/metric.component.ts @@ -1,5 +1,5 @@ import { EmdataService } from '../core/network/services/emdata.service'; -import { ActivatedRoute } from '@angular/router'; +import { ActivatedRoute, Router } from '@angular/router'; import { Component, OnInit, TemplateRef } from '@angular/core'; import { EMModel } from 'app/Models/EMModel'; import { BsModalService, BsModalRef } from 'ngx-bootstrap/modal'; @@ -15,6 +15,7 @@ export class MetricComponent implements OnInit { modalRef: BsModalRef; constructor( + private router: Router, private route: ActivatedRoute, private modalService: BsModalService, private emDataService: EmdataService) { @@ -35,4 +36,16 @@ export class MetricComponent implements OnInit { openModal(template: TemplateRef) { this.modalRef = this.modalService.show(template, {animated: false, class: 'sfb-modal-dialog'}); } + + onDownload() { + + } + + onPrintPage() { + window.print(); + } + + onGotoBenchmark() { + this.router.navigate(['efficiency-metric/comparison-type/', this.urn, this.model.name]); + } } diff --git a/src/assets/images/help-icon-2x.png b/src/assets/images/help-icon-2x.png new file mode 100644 index 0000000..3998633 Binary files /dev/null and b/src/assets/images/help-icon-2x.png differ diff --git a/src/assets/images/help-icon.png b/src/assets/images/help-icon.png new file mode 100644 index 0000000..b5d087a Binary files /dev/null and b/src/assets/images/help-icon.png differ diff --git a/src/assets/images/icon-file-download-small.png b/src/assets/images/icon-file-download-small.png new file mode 100644 index 0000000..3060262 Binary files /dev/null and b/src/assets/images/icon-file-download-small.png differ diff --git a/src/assets/images/icon-file-download.png b/src/assets/images/icon-file-download.png new file mode 100644 index 0000000..02f769d Binary files /dev/null and b/src/assets/images/icon-file-download.png differ diff --git a/src/assets/images/icon-print.png b/src/assets/images/icon-print.png new file mode 100644 index 0000000..d6b1372 Binary files /dev/null and b/src/assets/images/icon-print.png differ diff --git a/src/styles.scss b/src/styles.scss index 04257f8..35707f3 100644 --- a/src/styles.scss +++ b/src/styles.scss @@ -19,6 +19,12 @@ a{ .a-button{ text-decoration: none; + &:visited{ + color: initial!important; + } + &:hover{ + text-decoration: none; + } } .back-button{ @@ -30,7 +36,7 @@ a{ } .small-icon{ - width: 20px; + //width: 20px; margin-right: 5px; } @@ -58,7 +64,7 @@ a{ .highlight { background-color: #d53880; display: inline; - padding: 5px 5px; + padding: 2px 5px; span { color: white; @@ -83,7 +89,7 @@ span.table-cell-highlight { background-color: #d53880; display: inline; - padding: 6px 8px 6px 8px; + padding: 2px 5px; color: white; line-height: 1.8em; font-weight: bold; @@ -92,7 +98,7 @@ span.table-cell-highlight { a.table-cell-highlight { background-color: #d53880; display: inline; - padding: 6px 8px 6px 8px; + padding: 2px 5px; color: white; text-decoration: none; font-weight: bold; @@ -231,3 +237,22 @@ span.table-cell-highlight { margin-top: 1em; display: block; } + +@media print { + .show-in-print { + display: block!important; + } + + .hide-in-print { + display: none!important; + } + + .main-header{ + margin-top: 1em!important; + } + + .expand-in-print{ + width: 100%; + } + +}