Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
run: flutter pub get

- name: Build Flutter web
run: flutter build web --release --base-href /rostrem-website/
run: flutter build web --release --base-href /rostrix-website/

- name: Deploy to Separate Repository
env:
Expand All @@ -36,5 +36,5 @@ jobs:
git add .
git commit -m "Deploy Version $(date +'%Y-%m-%d %H:%M:%S') - Commit $COMMIT_HASH"
git branch -M main
git remote add origin https://x-access-token:${PERSONAL_ACCESS_TOKEN}@github.com/devsticks/rostrem-website.git
git remote add origin https://x-access-token:${PERSONAL_ACCESS_TOKEN}@github.com/devsticks/rostrix-website.git
git push -u -f origin main
6 changes: 3 additions & 3 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,18 @@
"version": "0.2.0",
"configurations": [
{
"name": "rostrem",
"name": "rostrix",
"request": "launch",
"type": "dart"
},
{
"name": "rostrem (profile mode)",
"name": "rostrix (profile mode)",
"request": "launch",
"type": "dart",
"flutterMode": "profile"
},
{
"name": "rostrem (release mode)",
"name": "rostrix (release mode)",
"request": "launch",
"type": "dart",
"flutterMode": "release"
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[![macos](https://github.com/devsticks/rostrem/actions/workflows/macos.yml/badge.svg)](https://github.com/devsticks/rostrem/actions/workflows/macos.yml) [![tests](https://github.com/devsticks/rostrem/actions/workflows/tests.yml/badge.svg)](https://github.com/devsticks/rostrem/actions/workflows/tests.yml) [![codecov](https://codecov.io/github/devsticks/rostrem/graph/badge.svg?token=KTXO3HV7SL)](https://codecov.io/github/devsticks/rostrem)
# Rostrem
[![macos](https://github.com/devsticks/rostrix/actions/workflows/macos.yml/badge.svg)](https://github.com/devsticks/rostrix/actions/workflows/macos.yml) [![tests](https://github.com/devsticks/rostrix/actions/workflows/tests.yml/badge.svg)](https://github.com/devsticks/rostrix/actions/workflows/tests.yml) [![codecov](https://codecov.io/github/devsticks/rostrix/graph/badge.svg?token=KTXO3HV7SL)](https://codecov.io/github/devsticks/rostrix)
# Rostrix

An automated doctors' roster builder, written in Flutter. For now, set up with the rules followed by Settlers Hospital in Makhanda, South Africa.
Settlers is a district hospital with 10 Medical Officers.
Expand Down
2 changes: 1 addition & 1 deletion android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ android {

defaultConfig {
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
applicationId "com.example.rostrem"
applicationId "com.example.rostrix"
// You can update the following values to match your application needs.
// For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
minSdkVersion flutter.minSdkVersion
Expand Down
2 changes: 1 addition & 1 deletion android/app/src/debug/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.example.rostrem">
package="com.example.rostrix">
<!-- The INTERNET permission is required for development. Specifically,
the Flutter tool needs it to communicate with the running application
to allow setting breakpoints, to provide hot reload, etc.
Expand Down
4 changes: 2 additions & 2 deletions android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.example.rostrem">
package="com.example.rostrix">
<application
android:label="rostrem"
android:label="rostrix"
android:name="${applicationName}"
android:icon="@mipmap/ic_launcher">
<activity
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.example.rostrem
package com.example.rostrix

import io.flutter.embedding.android.FlutterActivity

Expand Down
2 changes: 1 addition & 1 deletion android/app/src/profile/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.example.rostrem">
package="com.example.rostrix">
<!-- The INTERNET permission is required for development. Specifically,
the Flutter tool needs it to communicate with the running application
to allow setting breakpoints, to provide hot reload, etc.
Expand Down
6 changes: 3 additions & 3 deletions ios/Runner.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
PRODUCT_BUNDLE_IDENTIFIER = com.example.rostrem;
PRODUCT_BUNDLE_IDENTIFIER = com.example.rostrix;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
SWIFT_VERSION = 5.0;
Expand Down Expand Up @@ -424,7 +424,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
PRODUCT_BUNDLE_IDENTIFIER = com.example.rostrem;
PRODUCT_BUNDLE_IDENTIFIER = com.example.rostrix;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
Expand All @@ -446,7 +446,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
PRODUCT_BUNDLE_IDENTIFIER = com.example.rostrem;
PRODUCT_BUNDLE_IDENTIFIER = com.example.rostrix;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
SWIFT_VERSION = 5.0;
Expand Down
4 changes: 2 additions & 2 deletions ios/Runner/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@
<key>CFBundleDevelopmentRegion</key>
<string>$(DEVELOPMENT_LANGUAGE)</string>
<key>CFBundleDisplayName</key>
<string>Rostrem</string>
<string>Rostrix</string>
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>rostrem</string>
<string>Rostrix</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
Expand Down
8 changes: 4 additions & 4 deletions lib/main.dart
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@ import 'package:flutter/material.dart';
import 'screens/roster_home_page.dart';

void main() {
runApp(const RostremApp());
runApp(const RostrixApp());
}

class RostremApp extends StatelessWidget {
const RostremApp({super.key});
class RostrixApp extends StatelessWidget {
const RostrixApp({super.key});

@override
Widget build(BuildContext context) {
return MaterialApp(
title: 'Rostrem',
title: 'Rostrix',
theme: ThemeData(
primarySwatch: Colors.red,
),
Expand Down
6 changes: 3 additions & 3 deletions lib/screens/roster_home_page.dart
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'package:flutter/material.dart';
import 'package:rostrem/models/assignment_generator.dart';
import 'package:rostrem/widgets/loading_overlay.dart';
import 'package:rostrix/models/assignment_generator.dart';
import 'package:rostrix/widgets/loading_overlay.dart';
import 'package:sidebarx/sidebarx.dart';
import '../models/doctor.dart';
import '../models/shift.dart';
Expand Down Expand Up @@ -430,7 +430,7 @@ class RosterHomePageState extends State<RosterHomePage> {
return Scaffold(
key: _key,
appBar: AppBar(
title: const Text('Doctors\' Overtime Call Roster'),
title: const Text('Rostrix'),
leading: isSmallScreen
? IconButton(
icon: const Icon(Icons.menu),
Expand Down
4 changes: 2 additions & 2 deletions linux/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ project(runner LANGUAGES CXX)

# The name of the executable created for the application. Change this to change
# the on-disk name of your application.
set(BINARY_NAME "rostrem")
set(BINARY_NAME "rostrix")
# The unique GTK application identifier for this application. See:
# https://wiki.gnome.org/HowDoI/ChooseApplicationID
set(APPLICATION_ID "com.example.rostrem")
set(APPLICATION_ID "com.example.rostrix")

# Explicitly opt in to modern CMake behaviors to avoid warnings with recent
# versions of CMake.
Expand Down
4 changes: 2 additions & 2 deletions linux/my_application.cc
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,11 @@ static void my_application_activate(GApplication* application) {
if (use_header_bar) {
GtkHeaderBar* header_bar = GTK_HEADER_BAR(gtk_header_bar_new());
gtk_widget_show(GTK_WIDGET(header_bar));
gtk_header_bar_set_title(header_bar, "rostrem");
gtk_header_bar_set_title(header_bar, "rostrix");
gtk_header_bar_set_show_close_button(header_bar, TRUE);
gtk_window_set_titlebar(window, GTK_WIDGET(header_bar));
} else {
gtk_window_set_title(window, "rostrem");
gtk_window_set_title(window, "rostrix");
}

gtk_window_set_default_size(window, 1280, 720);
Expand Down
6 changes: 3 additions & 3 deletions macos/Runner.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
22719144E1ACAD41C0062D12 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
333000ED22D3DE5D00554162 /* Warnings.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Warnings.xcconfig; sourceTree = "<group>"; };
335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GeneratedPluginRegistrant.swift; sourceTree = "<group>"; };
33CC10ED2044A3C60003C045 /* rostrem.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = rostrem.app; sourceTree = BUILT_PRODUCTS_DIR; };
33CC10ED2044A3C60003C045 /* rostrix.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = rostrix.app; sourceTree = BUILT_PRODUCTS_DIR; };
33CC10F02044A3C60003C045 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
33CC10F22044A3C60003C045 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Assets.xcassets; path = Runner/Assets.xcassets; sourceTree = "<group>"; };
33CC10F52044A3C60003C045 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MainMenu.xib; sourceTree = "<group>"; };
Expand Down Expand Up @@ -112,7 +112,7 @@
33CC10EE2044A3C60003C045 /* Products */ = {
isa = PBXGroup;
children = (
33CC10ED2044A3C60003C045 /* rostrem.app */,
33CC10ED2044A3C60003C045 /* rostrix.app */,
);
name = Products;
sourceTree = "<group>";
Expand Down Expand Up @@ -192,7 +192,7 @@
);
name = Runner;
productName = Runner;
productReference = 33CC10ED2044A3C60003C045 /* rostrem.app */;
productReference = 33CC10ED2044A3C60003C045 /* rostrix.app */;
productType = "com.apple.product-type.application";
};
/* End PBXNativeTarget section */
Expand Down
8 changes: 4 additions & 4 deletions macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "33CC10EC2044A3C60003C045"
BuildableName = "rostrem.app"
BuildableName = "rostrix.app"
BlueprintName = "Runner"
ReferencedContainer = "container:Runner.xcodeproj">
</BuildableReference>
Expand All @@ -31,7 +31,7 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "33CC10EC2044A3C60003C045"
BuildableName = "rostrem.app"
BuildableName = "rostrix.app"
BlueprintName = "Runner"
ReferencedContainer = "container:Runner.xcodeproj">
</BuildableReference>
Expand All @@ -54,7 +54,7 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "33CC10EC2044A3C60003C045"
BuildableName = "rostrem.app"
BuildableName = "rostrix.app"
BlueprintName = "Runner"
ReferencedContainer = "container:Runner.xcodeproj">
</BuildableReference>
Expand All @@ -71,7 +71,7 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "33CC10EC2044A3C60003C045"
BuildableName = "rostrem.app"
BuildableName = "rostrix.app"
BlueprintName = "Runner"
ReferencedContainer = "container:Runner.xcodeproj">
</BuildableReference>
Expand Down
6 changes: 3 additions & 3 deletions macos/Runner/Configs/AppInfo.xcconfig
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
// 'flutter create' template.

// The application's name. By default this is also the title of the Flutter window.
PRODUCT_NAME = rostrem
PRODUCT_NAME = Rostrix

// The application's bundle identifier
PRODUCT_BUNDLE_IDENTIFIER = com.example.rostrem
PRODUCT_BUNDLE_IDENTIFIER = com.example.rostrix

// The copyright displayed in application information
PRODUCT_COPYRIGHT = Copyright © 2024 com.example. All rights reserved.
PRODUCT_COPYRIGHT = Copyright © 2024 Devin Stickells. All rights reserved.
4 changes: 2 additions & 2 deletions pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: rostrem
description: Rostering automated, cause life's too short.
name: rostrix
description: Rostering, automated. Cause life's too short.
# The following line prevents the package from being accidentally published to
# pub.dev using `flutter pub publish`. This is preferred for private packages.
publish_to: 'none' # Remove this line if you wish to publish to pub.dev
Expand Down
8 changes: 4 additions & 4 deletions test/models/assignment_generator_test.dart
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import 'package:flutter_test/flutter_test.dart';
import 'package:rostrem/models/assignment_generator.dart';
import 'package:rostrem/models/roster.dart';
import 'package:rostrem/models/shift.dart';
import 'package:rostrem/models/doctor.dart';
import 'package:rostrix/models/assignment_generator.dart';
import 'package:rostrix/models/roster.dart';
import 'package:rostrix/models/shift.dart';
import 'package:rostrix/models/doctor.dart';

void main() {
group('AssignmentGenerator model tests', () {
Expand Down
2 changes: 1 addition & 1 deletion test/models/doctor_test.dart
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'package:flutter_test/flutter_test.dart';
import 'package:intl/intl.dart';
import 'package:rostrem/models/doctor.dart';
import 'package:rostrix/models/doctor.dart';

void main() {
group('Doctor Model Tests', () {
Expand Down
8 changes: 4 additions & 4 deletions test/models/roster_test.dart
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import 'package:flutter_test/flutter_test.dart';
import 'package:rostrem/models/assignment_generator.dart';
import 'package:rostrem/models/roster.dart';
import 'package:rostrem/models/shift.dart';
import 'package:rostrem/models/doctor.dart';
import 'package:rostrix/models/assignment_generator.dart';
import 'package:rostrix/models/roster.dart';
import 'package:rostrix/models/shift.dart';
import 'package:rostrix/models/doctor.dart';
import 'package:mockito/mockito.dart';
import 'package:mockito/annotations.dart';
import 'package:flutter/material.dart';
Expand Down
6 changes: 3 additions & 3 deletions test/models/roster_test.mocks.dart
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Mocks generated by Mockito 5.4.4 from annotations
// in rostrem/test/models/roster_test.dart.
// in rostrix/test/models/roster_test.dart.
// Do not manually edit this file.

// ignore_for_file: no_leading_underscores_for_library_prefixes
Expand All @@ -14,8 +14,8 @@ import 'package:flutter/material.dart' as _i2;
import 'package:flutter/src/widgets/notification_listener.dart' as _i4;
import 'package:mockito/mockito.dart' as _i1;
import 'package:mockito/src/dummies.dart' as _i6;
import 'package:rostrem/models/assignment_generator.dart' as _i8;
import 'package:rostrem/models/roster.dart' as _i10;
import 'package:rostrix/models/assignment_generator.dart' as _i8;
import 'package:rostrix/models/roster.dart' as _i10;

// ignore_for_file: type=lint
// ignore_for_file: avoid_redundant_argument_values
Expand Down
4 changes: 2 additions & 2 deletions test/models/shift_test.dart
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'package:flutter_test/flutter_test.dart';
import 'package:rostrem/models/shift.dart';
import 'package:rostrem/models/doctor.dart';
import 'package:rostrix/models/shift.dart';
import 'package:rostrix/models/doctor.dart';

void main() {
group('Shift Model Tests', () {
Expand Down
10 changes: 5 additions & 5 deletions test/screens/roster_home_page_test.dart
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
import 'package:flutter/material.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:rostrem/screens/roster_home_page.dart';
import 'package:rostrem/widgets/roster_display.dart';
import 'package:rostrem/widgets/doctors_summary_table.dart';
import 'package:rostrem/widgets/leave_management.dart';
import 'package:rostrix/screens/roster_home_page.dart';
import 'package:rostrix/widgets/roster_display.dart';
import 'package:rostrix/widgets/doctors_summary_table.dart';
import 'package:rostrix/widgets/leave_management.dart';

void main() {
testWidgets('Roster Home Page renders correctly',
(WidgetTester tester) async {
await tester.pumpWidget(const MaterialApp(home: RosterHomePage()));

expect(find.text('Doctors\' Overtime Call Roster'), findsOneWidget);
expect(find.text('Rostrix'), findsOneWidget);
expect(find.byType(RosterDisplay), findsOneWidget,
reason: 'RosterDisplay widget not found');
});
Expand Down
4 changes: 2 additions & 2 deletions web/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@
<!-- iOS meta tags & icons -->
<meta name="apple-mobile-web-app-capable" content="yes">
<meta name="apple-mobile-web-app-status-bar-style" content="black">
<meta name="apple-mobile-web-app-title" content="rostrem">
<meta name="apple-mobile-web-app-title" content="rostrix">
<link rel="apple-touch-icon" href="icons/Icon-192.png">

<!-- Favicon -->
<link rel="icon" type="image/png" href="favicon.png"/>

<title>Rostrem</title>
<title>Rostrix</title>
<link rel="manifest" href="manifest.json">

<script>
Expand Down
8 changes: 4 additions & 4 deletions web/manifest.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"name": "Rostrem",
"short_name": "Rostrem",
"name": "Rostrix",
"short_name": "Rostrix",
"start_url": ".",
"display": "standalone",
"background_color": "#0175C2",
"theme_color": "#0175C2",
"background_color": "#c10155",
"theme_color": "#c10155",
"description": "Rostering, automated.",
"orientation": "portrait-primary",
"prefer_related_applications": false,
Expand Down
Loading