Skip to content

Commit

Permalink
TASK-300 Add calendar image to no schedule uploaded screen (#214)
Browse files Browse the repository at this point in the history
* TASK-300 Add calendar image to no-schedule-uploaded screen

* Replace calendar image with nurse image

* Comment out the failing test

* Add timeout to tests

* Increase timeout on nurse shifts table loading to 10s

Co-authored-by: Paweł Renc <[email protected]>
  • Loading branch information
Sig00rd and prenc authored Feb 25, 2021
1 parent dc3213e commit e733675
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 8 deletions.
4 changes: 2 additions & 2 deletions cypress/support/commands.ts
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ Cypress.Commands.add(
cy.clock(Date.UTC(year ?? TEST_SCHEDULE_YEAR, month ?? TEST_SCHEDULE_MONTH, 15), ["Date"]);
cy.visit(Cypress.env("baseUrl"));
cy.get("[data-cy=file-input]").attachFile(scheduleName);
cy.get(`[data-cy=nurseShiftsTable]`).should("exist");
cy.get(`[data-cy=nurseShiftsTable]`, { timeout: 10000 }).should("exist");
cy.window()
.its("store")
.invoke("getState")
Expand All @@ -74,7 +74,7 @@ Cypress.Commands.add(
const section = `${workerType.toLowerCase()}ShiftsTable`;
const row = baseRowDataCy(workerIdx);
const cell = baseCellDataCy(shiftIdx, selector);
return cy.get(`[data-cy=${section}] [data-cy=${row}] [data-cy=${cell}]`);
return cy.get(`[data-cy=${section}] [data-cy=${row}] [data-cy=${cell}]`, { timeout: 5000 });
}
);

Expand Down
Binary file added src/assets/images/nurse.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 1 addition & 2 deletions src/assets/styles/styles/custom/_month-switch.scss
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,7 @@
min-height: 80vh;

img {
width: 150px;
height: 100px;
height: 270px;
}

p {
Expand Down
6 changes: 2 additions & 4 deletions src/components/schedule-page/new-month-plan.component.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import { ScheduleKey } from "../../api/persistance-store.model";
import { MonthSwitchActionCreator } from "../../state/reducers/month-state/schedule-data/month-switch.action-creator";
import { LocalStorageProvider } from "../../api/local-storage-provider.model";
import { MonthDataModel } from "../../common-models/schedule-data.model";
import nurse from "../../assets/images/nurse.png";

export function NewMonthPlanComponent(): JSX.Element {
const { month_number: currentMonth, year: currentYear } = useSelector(
Expand Down Expand Up @@ -74,10 +75,7 @@ export function NewMonthPlanComponent(): JSX.Element {
return (
<>
<div className={"newMonthComponents"}>
<img
src="https://filestore.community.support.microsoft.com/api/images/72e3f188-79a1-465f-90ca-27262d769841"
alt=""
/>
<img src={nurse} alt="" />
<p>Nie masz planu na ten miesiąc</p>
<div className={"newPageButtonsPane"}>
{hasValidPrevious && (
Expand Down

0 comments on commit e733675

Please sign in to comment.