AB#32085: Add page numbering (#424)

* AB#32085: Add page numbers * Add page numbering to other rendering state * Add styling tweaks and note filtering * WIP: tweak styling for better page breaks * Add tweaked test script * Fix duplicate hour cutoff bug * WIP: Latest tweaks for linetimetable printing * Fix page break issues when printing * Remove unused code for LineTimetable * Add footnote styling
HSLdevcom · Nov 22, 2024 · 3800544 · 3800544
1 parent 07d2fa5
commit 3800544
Show file tree

Hide file tree

Showing 15 changed files with 381 additions and 358 deletions.
diff --git a/src/components/a3Timetable/a3TableHeader.css b/src/components/a3Timetable/a3TableHeader.css
@@ -2,7 +2,7 @@
   margin: 0.938em 0;
   font-family: GothamRounded-Book;
   color: var(--timetable-text-color);
-  page-break-after: avoid;
+  break-after: avoid;
   margin: 0;
 }
 

diff --git a/src/components/app.js b/src/components/app.js
@@ -105,6 +105,10 @@ class App extends Component {
       rootStyle = { display: 'inline-block' };
     }
 
+    if (ComponentToRender === components.LineTimetable) {
+      rootStyle = { display: 'block' };
+    }
+
     return (
       <div
         style={rootStyle}

diff --git a/src/components/lineTimetable/allStopsList.css b/src/components/lineTimetable/allStopsList.css
@@ -1,8 +1,7 @@
 .stopListsContainer {
-  margin-top: 1rem;
+  padding-top: 1.2rem;
   max-width: 95%;
-  page-break-inside: avoid;
-  page-break-after: always;
+  break-inside: avoid;
 }
 
 .stopList {

diff --git a/src/components/lineTimetable/lineTableColumns.css b/src/components/lineTimetable/lineTableColumns.css
@@ -5,16 +5,21 @@
   margin: 0.5rem 0;
 }
 
+.breakContainer {
+  display: block;
+  break-inside: avoid;
+}
+
 .departureRow {
   font-size: 1rem;
   margin-left: 1.6rem;
   padding-top: 5px;
   padding-bottom: 5px;
   height: 35px;
+  break-inside: avoid;
 }
 
 .departureColumnContainer {
-  flex-grow: 1;
   align-items: normal;
   min-width: 100px;
   max-width: 350px;
@@ -34,12 +39,14 @@
   font-size: 15px;
   width: 1.5rem;
   margin-right: 0.5em;
+  break-inside: avoid;
 }
 
 .minutesContainer {
   max-width: 400px;
   display: flex;
   flex-wrap: wrap;
+  break-inside: avoid;
 }
 
 .minutes {
@@ -59,9 +66,3 @@
 .departureRowContainer > *:nth-child(even) {
   background-color: #eaeaea;
 }
-
-@media print {
-  .departureRow {
-    page-break-inside: avoid;
-  }
-}
diff --git a/src/components/lineTimetable/lineTableColumns.js b/src/components/lineTimetable/lineTableColumns.js
@@ -13,20 +13,22 @@ const LineTimetableRow = props => {
     return a.minutes - b.minutes;
   });
   return (
-    <WrappingRow>
-      <Row className={styles.departureRow}>
-        <div className={styles.hour}>{hour}</div>
-        <div className={styles.minutesContainer}>
-          {sortedMinuteDepartures.map((departure, index) => (
-            <div className={styles.minutes} key={index}>
-              {departure.note !== null
-                ? `${departure.minutes.toString().padStart(2, '0')}${departure.note}`
-                : departure.minutes.toString().padStart(2, '0')}
-            </div>
-          ))}
-        </div>
-      </Row>
-    </WrappingRow>
+    <div className={styles.breakContainer}>
+      <WrappingRow>
+        <Row className={styles.departureRow}>
+          <div className={styles.hour}>{hour}</div>
+          <div className={styles.minutesContainer}>
+            {sortedMinuteDepartures.map((departure, index) => (
+              <div className={styles.minutes} key={index}>
+                {departure.note !== null
+                  ? `${departure.minutes.toString().padStart(2, '0')}${departure.note}`
+                  : departure.minutes.toString().padStart(2, '0')}
+              </div>
+            ))}
+          </div>
+        </Row>
+      </WrappingRow>
+    </div>
   );
 };
 

diff --git a/src/components/lineTimetable/lineTableHeader.css b/src/components/lineTimetable/lineTableHeader.css
@@ -1,18 +1,25 @@
 .headerContainer {
+  display: block;
+  break-inside: avoid;
+  break-before: avoid-page;
+}
+
+.flexHeader {
   display: flex;
 }
 
 .stop {
   flex-grow: 1;
   height: 50px;
   padding-right: 16px;
-  margin-bottom: 1.5rem;
+  margin-bottom: 1rem;
 }
 
 .stopNamePrimary {
   font-size: 1rem;
   margin: 0 0 0 1.2rem;
   font-family: GothamRounded-Medium;
+  break-inside: avoid;
 }
 
 .stopNameSecondary {

diff --git a/src/components/lineTimetable/lineTableHeader.js b/src/components/lineTimetable/lineTableHeader.js
@@ -7,11 +7,13 @@ const LineTableHeader = props => {
   const { stop, isLastStop } = props;
   return (
     <div className={styles.headerContainer}>
-      <div className={styles.stop}>
-        <p className={styles.stopNamePrimary}>{stop.nameFi}</p>
-        <p className={styles.stopNameSecondary}>{stop.nameSe}</p>
+      <div className={styles.flexHeader}>
+        <div className={styles.stop}>
+          <p className={styles.stopNamePrimary}>{stop.nameFi}</p>
+          <p className={styles.stopNameSecondary}>{stop.nameSe}</p>
+        </div>
+        {!isLastStop && <div className={styles.directionBracket}>&gt;</div>}
       </div>
-      {!isLastStop && <div className={styles.directionBracket}>&gt;</div>}
     </div>
   );
 };

diff --git a/src/components/lineTimetable/lineTimetable.css b/src/components/lineTimetable/lineTimetable.css
@@ -1,147 +1,3 @@
-.root {
-  position: relative;
-  width: 100%;
-  padding: var(--border-radius);
-  padding-top: calc(var(--border-radius) - 15px);
-  border-radius: var(--border-radius);
-  color: var(--hsl-blue);
-  background: var(--light-background);
-  --timetable-accent-color: white;
-  font-size: 16px;
-  margin-bottom: 10px;
-  font-family: GothamRounded-Medium;
-}
-
-.root.a3 {
-  border-radius: 30px;
-  padding: 15px 0px 30px 0px;
-}
-
-.root.standalone {
-  font-size: 22px;
-}
-
-.root.summer {
-  background: white;
-  --timetable-accent-color: var(--light-background);
-}
-
-.root.greyscale {
-  background: white;
-  color: black;
-  --timetable-accent-color: #eaeaea;
-}
-
-.root.printable {
-  width: auto;
-  border-radius: 0;
-}
-
-.header {
-  padding: 0 0 0 0.4em;
-}
-
-.headerTitle {
-  font-size: 1.75em;
-}
-
-.componentName {
-  padding: 0 0 0 0.205em;
-  font-size: 1.875em;
-}
-
-.title {
-  font-family: GothamRounded-Medium;
-  white-space: nowrap;
-  font-size: 0.9em;
-}
-
-.subtitle {
-  font-family: GothamRounded-Book;
-  font-size: 0.9em;
-}
-
-.footnote {
-  padding: 0.125em 0.625em;
-  font-family: GothamXNarrow-Book;
-  font-size: 0.813em;
-}
-
-.validity {
-  font-family: GothamXNarrow-Book;
-  font-size: 0.75em;
-  line-height: 1.1;
-  letter-spacing: -0.025em;
-  text-align: right;
-  margin-left: auto;
-  position: absolute;
-  margin-top: -5px;
-  top: calc(var(--border-radius));
-  right: var(--border-radius);
-}
-
-.validity .shortId {
-  font-family: GothamRounded-Medium;
-  font-size: 1.75em;
-}
-
-.address {
-  font-family: GothamRounded-Medium;
-  font-size: 0.6rem;
-  color: black;
-  position: absolute;
-  top: 1110px;
-  right: var(--border-radius);
-}
-
-.validity .title {
-  font-family: GothamRounded-Medium;
-}
-
-.stopZone {
-  padding-left: 0.5em;
-  margin-top: 0.875em;
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-}
-
-.zoneTitle {
-  font-size: 0.75em;
-  line-height: 1.1;
-  font-family: GothamRounded-Medium;
-  white-space: nowrap;
-  margin-right: 0.4em;
-}
-
-.zoneSubtitle {
-  font-size: 0.75em;
-  composes: zoneTitle;
-  font-family: GothamRounded-Book;
-}
-
-.zone {
-  position: relative;
-  box-sizing: border-box;
-  flex: none;
-  width: 1.5em;
-  height: 1.5em;
-  color: white;
-  background: var(--hsl-blue);
-  border-radius: 50%;
-}
-
-.zoneLetter {
-  font-size: 1.25em;
-  position: absolute;
-  top: 50%;
-  left: 50%;
-  text-align: center;
-  line-height: 1;
-  font-family: GothamRounded-Medium;
-  text-transform: uppercase;
-}
-
 .timetableDays {
   margin: 0 1rem 1rem 1.2rem;
   font-size: 0.8em;
@@ -155,8 +11,14 @@
   font-family: GothamRounded-Book;
 }
 
+.footnote {
+  padding: 0.125em 0.625em;
+  font-family: GothamXNarrow-Book;
+  font-size: 0.813em;
+}
+
 .pageBreak {
-  page-break-inside: avoid;
+  break-inside: auto;
 }
 
 .timetableDivider {
@@ -166,7 +28,7 @@
 }
 
 .timetableContainer {
-  page-break-after: always;
+  display: block;
 }
 
 .fridayNote {
@@ -177,7 +39,17 @@
 
 .notesContainer {
   margin: 0.5rem 0 1rem 0.5rem;
-  page-break-after: always;
+}
+
+.pageNumber {
+  font-family: GothamRounded-Medium;
+  font-size: 16px;
+  color: black;
+  position: absolute;
+  left: 680px;
+  right: 30px;
+  width: fit-content;
+  height: fit-content;
 }
 
 @media print {
@@ -186,7 +58,8 @@
     display: none !important;
   }
 
-  body {
-    overflow-y: visible;
+  .timetableContainer,
+  .timetableContainer * {
+    break-inside: avoid;
   }
 }