Merge branch 'main' into main

CHANGELOG.md

@@ -1,3 +1,10 @@
+# [2.16.0](https://github.com/kolplattformen/skolplattformen/compare/v2.15.10...v2.16.0) (2023-11-02)
+
+
+### Features
+
+* navigate from "Your Children" to specific tabs ([#660](https://github.com/kolplattformen/skolplattformen/issues/660)) ([34c376a](https://github.com/kolplattformen/skolplattformen/commit/34c376a727ad0bbfbd3f7be01aedb91d1705b34b))
+
 ## [2.15.10](https://github.com/kolplattformen/skolplattformen/compare/v2.15.9...v2.15.10) (2023-10-07)
 
 

apps/skolplattformen-app/components/childListItem.component.tsx

@@ -232,11 +232,32 @@ export const ChildListItem = ({
           ))}
         </Pressable>
 
-        {scheduleAndCalendarThisWeek.length ||
-        notificationsThisWeek.length ||
-        newsThisWeek.length ? null : (
-          <Text category="p1" style={styles.noNewNewsItemsText}>
-            {t('news.noNewNewsItemsThisWeek')}
+
+      {scheduleAndCalendarThisWeek.length ||
+      notificationsThisWeek.length ||
+      newsThisWeek.length ? null : (
+        <Text category="p1" style={styles.noNewNewsItemsText}>
+          {t('news.noNewNewsItemsThisWeek')}
+        </Text>
+      )}
+      {shouldShowLunchMenu ? (
+        <Pressable
+          style={({ pressed }) => ['' || {}, { opacity: pressed ? 0.5 : 1 }]}
+          onPress={() =>
+            navigation.navigate('Child', {
+              child,
+              color,
+              initialRouteName: 'Menu',
+            })
+          }
+        >
+          <Text category="c2" style={styles.label}>
+            {meaningfulStartingDate.format(
+              '[' + t('schedule.lunch') + '] dddd'
+            )}
+          </Text>
+          <Text>
+            {menu[meaningfulStartingDate.isoWeekday() - 1]?.description}
           </Text>
         )}
 
@@ -262,20 +283,19 @@ export const ChildListItem = ({
           </Pressable>
         ) : null}
 
-        <View style={styles.itemFooter}>
-          <Button
-            accessible
-            accessibilityRole="button"
-            accessibilityLabel={`${child.name}, ${t('abscense.title')}`}
-            appearance="ghost"
-            accessoryLeft={AlertIcon}
-            status="primary"
-            style={styles.absenceButton}
-            onPress={() => navigation.navigate('Absence', { child })}
-          >
-            {t('abscense.title')}
-          </Button>
-        </View>
+      <View style={styles.itemFooter}>
+        <Button
+          accessible
+          accessibilityRole="button"
+          accessibilityLabel={`${child.name}, ${t('abscense.title')}`}
+          appearance="ghost"
+          accessoryLeft={AlertIcon}
+          status="primary"
+          style={styles.absenceButton}
+          onPress={() => navigation.navigate('Absence', { child })}
+        >
+          {t('abscense.title')}
+        </Button>
       </View>
     </>
   )

docs/ios_mac.md

@@ -49,7 +49,7 @@ For more information, please visit [CocoaPods Getting Started guide](https://gui
 
 ### Running on a device
 
-The above command will automatically run your app on the iOS Simulator by default. If you want to run the app on an actual physical iOS device, please follow the instructions [here](https://reactnative.dev/docs/running-on-device.
+The above command will automatically run your app on the iOS Simulator by default. If you want to run the app on an actual physical iOS device, please follow the instructions [here](https://reactnative.dev/docs/running-on-device).
 
 ## Running the app 
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "skolplattformen",
-  "version": "2.15.10",
+  "version": "2.16.0",
   "license": "MIT",
   "scripts": {
     "start": "nx start",