Skip to content

Commit 00cbc62

Browse files
committed
#999 - Support of unfreezing partial coffee beans.
1 parent 0de46eb commit 00cbc62

File tree

3 files changed

+30
-108
lines changed

3 files changed

+30
-108
lines changed

src/app/beans/bean-popover-unfreeze/bean-popover-unfreeze.component.html

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,25 +6,20 @@
66
<ion-icon name="beanconqueror-back" slot="icon-only"></ion-icon>
77
</ion-button>
88
</ion-buttons>
9-
<ion-buttons slot="end">
10-
<ion-button (click)="save()">
11-
<ion-icon name="checkmark" slot="icon-only"></ion-icon>
12-
</ion-button>
13-
</ion-buttons>
149
</ion-toolbar>
1510
</ion-header>
1611

1712
<ion-content>
13+
<ion-card>
1814
<ion-list>
1915
<ion-item>
20-
<ion-label position="stacked">{{"WEIGHT" | translate}} (g)</ion-label>
16+
<ion-label position="stacked">{{"BEAN_DATA_WEIGHT" | translate}}</ion-label>
2117
<ion-input type="number" [(ngModel)]="unfreezeWeight" placeholder="0" [max]="maxWeight"></ion-input>
2218
</ion-item>
2319

2420
<ion-item lines="none">
2521
<ion-range min="0" [max]="maxWeight" [pin]="true" [pinFormatter]="pinFormatter" [(ngModel)]="unfreezeWeight" step="0.1">
26-
<ion-icon slot="start" size="small" name="snow-outline"></ion-icon>
27-
<ion-icon slot="end" name="thermometer-outline"></ion-icon>
22+
<div class='ion-label' slot="end">{{maxWeight}}&nbsp;gr</div>
2823
</ion-range>
2924
</ion-item>
3025

@@ -65,8 +60,14 @@ <h2>{{"BEAN_POPOVER_COPY_ATTACHMENTS_QUALITY_MB" | translate}}</h2>
6560
<div class="ion-padding">
6661
<ion-button expand="block" (click)="save()" [disabled]="unfreezeWeight <= 0 || unfreezeWeight > maxWeight">
6762
<ion-icon name="thermometer-outline" slot="start"></ion-icon>
68-
{{"POPOVER_UNFREEZE_COFFEE_BEAN" | translate}}
63+
@if(unfreezeWeight === maxWeight) {
64+
{{"POPOVER_UNFREEZE_COFFEE_BEAN" | translate}}
65+
66+
} @else {
67+
{{"POPOVER_UNFREEZE_PARTIAL_COFFEE_BEAN" | translate}}
68+
}
6969
</ion-button>
7070
</div>
7171
</ion-list>
72+
</ion-card>
7273
</ion-content>
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
:host {
2+
ion-item {
3+
margin-left: 16px;
4+
margin-right: 16px;
5+
}
6+
.container {
7+
display: flex;
8+
}
9+
ion-list {
10+
background: var(--ion-color-light);
11+
}
12+
ion-label {
13+
line-height:18px;
14+
}
15+
}

src/assets/i18n/en.json

Lines changed: 5 additions & 99 deletions
Original file line numberDiff line numberDiff line change
@@ -1465,103 +1465,6 @@
14651465
"19": "Option to disable the connect\/disconnect popup for Bluetooth devices"
14661466
}
14671467
},
1468-
"CONNECTED": "Connected",
1469-
"DISCONNECTED": "Disconnected",
1470-
"EXPERIMENTAL_FEATURE_DISCLAIMER": "This is an experimental feature",
1471-
"SHOW_HOURS": "Show hours",
1472-
"SHOW_MINUTES": "Show minutes",
1473-
"BEANS_UNARCHIVE": "Unarchive",
1474-
"TOAST_BEAN_UNARCHIVED_SUCCESSFULLY": "Bean has been unarchived",
1475-
"TOAST_BEAN_UNFROZEN_SUCCESSFULLY": "Bean has been unfrozen",
1476-
"TOAST_BEAN_PARTIALLY_UNFROZEN_SUCCESSFULLY": "Bean has been partially unfrozen",
1477-
"WATER_TYPE_PURE_COFFEE_WATER": "Pure Coffee Water",
1478-
"WATER_TYPE_EMPIRICAL_WATER_GLACIAL": "empirical water GLACIAL",
1479-
"WATER_TYPE_EMPIRICAL_WATER_SPRING": "empirical water SPRING",
1480-
"SORT_PREPARATION_TOOLS": "Sort preparation tools",
1481-
"PREPARATION_TYPE_METICULOUS": "Meticulous",
1482-
"EXPORT_CAUTION": "Export just exports the database, no images, no flow-profiles, if these ones are needed, please visit Gitbook for more information",
1483-
"POPOVER_FREEZE_COFFEE_BEAN": "Freeze coffee bean",
1484-
"POPOVER_UNFREEZE_COFFEE_BEAN": "Unfreeze coffee bean",
1485-
"BEAN_POPOVER_EDIT_FREEZE_DATE": "Edit freeze date",
1486-
"BEAN_POPOVER_EDIT_UNFREEZE_DATE": "Edit unfreeze date",
1487-
"BEAN_POPOVER_LEFT_UNFROZEN": "Left unfrozen",
1488-
"BEAN_POPOVER_FREEZE_PARTIAL_BAG": "Freeze partial bag (g)",
1489-
"FROZEN_BEANS": "Frozen",
1490-
"BEAN_TAB_FROZEN_INFORMATION": "Frozen information",
1491-
"BEAN_POPOVER_FROZEN_BAGS": "Frozen bags",
1492-
"BEAN_POPOVER_FROZEN_DELETE_BEAN_MESSAGE": "You are going to freeze the whole bag, and we didn't find any brews done with it, do you want to delete to original bag?",
1493-
"CREATE_FROZEN_BEANS": "Create beans",
1494-
"BEAN_POPOVER_COPY_ATTACHMENTS": "Copy attachments",
1495-
"BEAN_POPOVER_COPY_ATTACHMENTS_DESCRIPTION": "Copy attachments is deactivated while this feature is in its initial phase",
1496-
"BEAN_DATA_FROZEN_DATE": "Frozen date",
1497-
"BEAN_DATA_UNFROZEN_DATE": "Unfrozen date",
1498-
"PAGE_BEANS_LIST_YOU_GOT_NO_FROZEN_BEANS": "You've got no frozen beans",
1499-
"BEAN_DATA_FROZEN_ID": "Frozen id",
1500-
"PAGE_SETTINGS_MANAGE_FEATURES": "Manage features",
1501-
"ACTIVE_BEAN_FREEZING_FEATURE": "Activate bean freezing",
1502-
"NAV_FROZEN_BEANS_LIST": "Frozen beans list",
1503-
"BEAN_BREW_LIST_VIEW_PARAMETERS": "Bean information for brew",
1504-
"BEAN_AGE_BY_BREW_DATE": "Bean age by brew date",
1505-
"BEAN_POPOVER_FROZEN_BEAN_WILL_BE_ARCHIVED_NOW_MESSAGE": "Your frozen bags, will result that your original bag has no weight left but you did brews with it, so please rate it and send it to the archive now",
1506-
"BEAN_POPOVER_YOU_CANT_FREEZE_WITH_ZERO_WEIGHT_LEFT": "You can't freeze, because the remaining weight of your bag is zero",
1507-
"BEAN_DATA_BEST_DATE": "Best bean date",
1508-
"BEAN_DATA_BEST_DATE_TOOLTIP": "When is the best date to use the beans?",
1509-
"BEAN_DATA_OPEN_DATE": "Bag open date",
1510-
"BEAN_DATA_OPEN_DATE_TOOLTIP": "When did you open up the bag of beans?",
1511-
"BEAN_FREEZING_STORAGE_TYPE_UNKNOWN": "Unknown",
1512-
"BEAN_FREEZING_STORAGE_TYPE_COFFEE_BAG": "Coffee bag",
1513-
"BEAN_FREEZING_STORAGE_TYPE_COFFEE_JAR": "Coffee jar",
1514-
"BEAN_FREEZING_STORAGE_TYPE_ZIP_LOCK": "Zip lock",
1515-
"BEAN_FREEZING_STORAGE_TYPE_VACUUM_SEALED": "Vacuum sealed",
1516-
"BEAN_FREEZING_STORAGE_TYPE_TUBE": "Tube",
1517-
"BEAN_DATA_FROZEN_STORAGE_TYPE": "Freezing storage type",
1518-
"PAGE_SETTINGS_BREW_RATING_CHANGED_BREWS_NOT_VISIBLE": "You've changed your brew maximum rating, but you've already rated brews higher then your actual maximum, so they won't be displayed with the normal filter settings.",
1519-
"PAGE_SETTINGS_BEAN_RATING_CHANGED_BEANS_NOT_VISIBLE": "You've changed your bean maximum rating, but you've already rated beans higher then your actual maximum, so they won't be displayed with the normal filter settings.",
1520-
"BEAN_DATA_FROZEN_NOTE": "Frozen notes",
1521-
"IGNORE_NEGATIVE_VALUES_DESCRIPTION": "Activating this, results into a graph which will be one second behind",
1522-
"IGNORE_ANOMALY_VALUES_DESCRIPTION": "Activating this, results into a graph which will be one second behind",
1523-
"SAVE_LOGFILES_TO_NOTES_FROM_MACHINE": "Save the machine logs when saving a brew",
1524-
"IMPORT_SHOT_FROM_METICULOUS": "Import a shot",
1525-
"BEANS_IMPORTED_SUCCESSFULLY_DESCRIPTION": "All found entries in the excel list, have been transformed into new beans, enjoy a tasty brew!",
1526-
"IMPORT_UNSUCCESSFULLY": "Import not successful",
1527-
"BEAN_LIST": "Bean list",
1528-
"IMPORT_ROASTED_BEANS_EXCEL": "Import roasted beans via excel",
1529-
"IMPORT_GREEN_BEANS_EXCEL": "Import green beans via excel",
1530-
"BEANS_IMPORTED_UNSUCCESSFULLY_WRONG_EXCELFILE": "It looks like that the chosen excel file is corrupted, has wrong data, is wrong structured, or was wrongly chosen. Because of this no beans could be imported.",
1531-
"OK": "Ok",
1532-
"BEAN_SORT_BEAN_AGE": "Bean age",
1533-
"GREEN_BEANS_IMPORTED_SUCCESSFULLY_DESCRIPTION": "All found entries in the excel list, have been transformed into new green beans, have great roasts!",
1534-
"PREPARATION_TYPE_SANREMO_YOU": "Sanremo YOU",
1535-
"PREPARATION_TYPE_XENIA": "Xenia",
1536-
"BEAN_POPUP_YOU_DONT_SEE_EVERYTHING_DESCRIPTION": "You're adding a bean which has variety information in it, but those parameters are not activated. Do you want to activate them now?",
1537-
"PAGE_SETTINGS_TAB_BLUETOOTH_PRESSURE_GRAPHS_AXIS": "Define the axes for the pressure graph",
1538-
"PAGE_SETTINGS_TAB_BLUETOOTH_PRESSURE_GRAPHS_AXIS_DESCRIPTION": "Set the starting and end size of the axes for pressure",
1539-
"PAGE_SETTINGS_TAB_BLUETOOTH_PRESSURE_GRAPHS_AXIS_RANGE": "Pressure axes",
1540-
"PAGE_SETTINGS_LANGUAGE_DUTCH": "Dutch",
1541-
"DOWNLOAD_IMPORT_EXCEL_TEMPLATES": "Download import templates",
1542-
"SHOW_GRAPH": "Show graph",
1543-
"FULL_IMPORT_FROM_DIRECTORY": "Full import from directory",
1544-
"FULL_IMPORT_FROM_DIRECTORY_DESCRIPTION": "Import all data (including all pictures and flow profiles) from the selected directory.",
1545-
"FULL_IMPORT_FROM_DIRECTORY_FILE_NOT_FOUND": "Could not find {{fileName}} in selected directory. Please pick a different directory.",
1546-
"FULL_EXPORT_TO_DIRECTORY": "Full export to directory",
1547-
"FULL_EXPORT_TO_DIRECTORY_DESCRIPTION": "Export all data (including all pictures and flow profiles) to the selected directory.",
1548-
"FULL_EXPORT_TO_DIRECTORY_FILE_ALREADY_EXISTS": "{{fileName}} already exists in the selected directory. Please clean up the directory and try again.",
1549-
"EXPORT_COMPLETED": "Export was completed.",
1550-
"BLUETOOTH_NOT_ENABLED": "Bluetooth not activated, please activate to work properly",
1551-
"SEARCH_BLUETOOTH_DEVICES": "Search Bluetooth Devices",
1552-
"CONNECT_SCALE": "Connect scale",
1553-
"CONNECT_PRESSURE": "Connect pressure",
1554-
"CONNECT_TEMPERATURE": "Connect temperature",
1555-
"CONNECT_REFRACTOMETER": "Connect refractometer",
1556-
"DISCONNECT_SCALE": "Disconnect scale",
1557-
"DISCONNECT_PRESSURE": "Disconnect pressure",
1558-
"DISCONNECT_TEMPERATURE": "Disconnect temperature",
1559-
"DISCONNECT_REFRACTOMETER": "Disconnect refractometer",
1560-
"NO_DEVICES_FOUND_PLEASE_TRY_AGAIN": "We didn't find any supported bluetooth devices, please try again",
1561-
"HIDE_VALUE_CARDS_ON_MAXIMIZED_SCREEN": "Hide value cards on maximized screen",
1562-
"BLUETOOTH_REQUEST_PERMISSION": {
1563-
"LOCATION": "To find bluetooth devices, the app needs access to the location.",
1564-
"BLUETOOTH": "To find bluetooth devices, the app needs access to bluetooth"
15651468
"8.4.0": {
15661469
"TITLE": "Version 8.4.0: What's new",
15671470
"DESCRIPTION": [
@@ -1687,7 +1590,10 @@
16871590
"BEST_BEAN": "Highest Rated Bean"
16881591
},
16891592
"SUMMARY": {
1690-
"TITLE": "That's a Wrap!"
1593+
"TITLE": "That's a Wrap!"
16911594
}
1692-
}
1595+
},
1596+
"TOAST_BEAN_UNFROZEN_SUCCESSFULLY": "Bean has been unfrozen",
1597+
"TOAST_BEAN_PARTIALLY_UNFROZEN_SUCCESSFULLY": "Bean has been partially unfrozen",
1598+
"POPOVER_UNFREEZE_PARTIAL_COFFEE_BEAN": "Unfreeze partial coffee bean"
16931599
}

0 commit comments

Comments
 (0)