diff --git a/app/Announcements.js b/app/Announcements.js index 45c5e2c..9439660 100644 --- a/app/Announcements.js +++ b/app/Announcements.js @@ -99,8 +99,8 @@ export const TeacherList = ({route}) => { else if (itemDate.getTime() > todayDate.getTime() && itemDate.getTime() <= weekFutureDate.getTime()) { future.push(route.params.data[i]) } - //else if (itemDate >= weekPastDate && itemDate < todayDate) { - else if (itemDate.getTime() < todayDate.getTime()) { + else if (itemDate >= weekPastDate && itemDate < todayDate) { + //else if (itemDate.getTime() < todayDate.getTime()) { past.push(route.params.data[i]) } } diff --git a/app/Calendar.js b/app/Calendar.js index 10384ad..1686b22 100644 --- a/app/Calendar.js +++ b/app/Calendar.js @@ -35,14 +35,12 @@ const getCurrentDate=()=>{ } export const EventInfo = ({route}) => { const item = route.params; - const itemDate = new Date(item.event_date) + const itemDate = new Date(parseInt(String(item.event_date).split('-')[0]), parseInt(String(item.event_date).split('-')[1])-1, parseInt(String(item.event_date).split('-')[2])) const days = ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'] const months = ['January','February','March','April','May','June','July','August','September','October','November','December',] - const dayOfWeek = days[itemDate.getDay()+1] + const dayOfWeek = days[itemDate.getDay()] const month = months[itemDate.getMonth()] - const date = itemDate.getDate()+1 - - console.log(itemDate.getDate()) + const date = itemDate.getDate() return ( @@ -216,8 +214,8 @@ class Calendar extends React.Component { else if (itemDate > todayDate && itemDate <= weekFutureDate) { future.push(this.state.data[i]) } - //else if (itemDate >= weekPastDate && itemDate < todayDate) { - else if (itemDate < todayDate) { + else if (itemDate >= weekPastDate && itemDate < todayDate) { + //else if (itemDate < todayDate) { past.push(this.state.data[i]) } } diff --git a/app/Home.js b/app/Home.js index 824c65a..55aaa84 100644 --- a/app/Home.js +++ b/app/Home.js @@ -113,8 +113,8 @@ export const TeacherList = ({route}) => { else if (itemDate.getTime() > todayDate.getTime() && itemDate.getTime() <= weekFutureDate.getTime()) { future.push(route.params.data[i]) } - //else if (itemDate >= weekPastDate && itemDate < todayDate) { - else if (itemDate.getTime() < todayDate.getTime()) { + else if (itemDate >= weekPastDate && itemDate < todayDate) { + //else if (itemDate.getTime() < todayDate.getTime()) { past.push(route.params.data[i]) } } @@ -168,15 +168,15 @@ export const whatsNew = ({route}) => { var futureBoolean = true for (var i = 0; i < route.params.data.length; i++) { - const itemDate = new Date(route.params.data[i].date) + const itemDate = new Date(parseInt(String(route.params.data[i].new_date).split('-')[0]), parseInt(String(route.params.data[i].new_date).split('-')[1])-1, parseInt(String(route.params.data[i].new_date).split('-')[2])) if (itemDate.getTime() == todayDate.getTime()) { today.push(route.params.data[i]) } else if (itemDate.getTime() > todayDate.getTime() && itemDate.getTime() <= weekFutureDate.getTime()) { future.push(route.params.data[i]) } - //else if (itemDate >= weekPastDate && itemDate < todayDate) { - else if (itemDate.getTime() < todayDate.getTime()) { + else if (itemDate >= weekPastDate && itemDate < todayDate) { + //else if (itemDate.getTime() < todayDate.getTime()) { past.push(route.params.data[i]) } } @@ -196,16 +196,16 @@ export const whatsNew = ({route}) => { export const NewItem = ({route}) => { const item = route.params.data - const iconURI = item.image !== undefined?`data:image/png;charset=utf-8;base64,${item.image}`:'' return ( - + - {item.date} + {item.new_date} {item.name} + {item.text} ) @@ -247,9 +247,9 @@ const New = (props) => { return ( props.navigation.navigate('NewItem', {data:props.item.item})}> - + - {item.item.date} + {item.item.new_date} {text} @@ -380,7 +380,6 @@ function HomeStack() { } function HomeScreen (props) { - console.log(props.studentData) var showStudent = true if (props.studentData.length==0) {showStudent = false} const iconURI = null @@ -393,16 +392,15 @@ function HomeScreen (props) { var todayNewBoolean = true var showLunch = false for (var i = 0; i < props.annData.length; i++) { - const itemDate = new Date(props.annData[i].date) - if (itemDate == todayDate) todayAnn.push(props.annData[i]) - else todayAnn.push(props.annData[i]) + const itemDate = new Date(parseInt(String(props.annData[i].date).split('-')[0]), parseInt(String(props.annData[i].date).split('-')[1])-1, parseInt(String(props.annData[i].date).split('-')[2])) + if (itemDate.getTime() == todayDate.getTime()) todayAnn.push(props.annData[i]) } for (var i = 0; i < props.data.length; i++) { - const itemDate = new Date(props.data[i].date) - if (itemDate == todayDate) todayNew.push(props.data[i]) + const itemDate = new Date(parseInt(String(props.data[i].new_date).split('-')[0]), parseInt(String(props.data[i].new_date).split('-')[1])-1, parseInt(String(props.data[i].new_date).split('-')[2])) + if (itemDate.getTime() == todayDate.getTime()) todayNew.push(props.data[i]) } - + if (todayAnn.length === 0) todayAnnBoolean = false if (todayNew.length ===0) todayNewBoolean = false todayAnn = todayAnn.slice(0, 4) @@ -467,7 +465,7 @@ function HomeScreen (props) { {I18n.t('home.SOTW')} - + {props.studentData[props.studentData.length-1].name}, Grade {props.studentData[props.studentData.length-1].grade} @@ -560,10 +558,11 @@ class Home extends React.Component { return response.text(); }) .then((json) => { - const data = JSON.parse(json).data + const data = JSON.parse(json) data.sort((a,b)=>a.id-b.id) data.sort((a,b)=>new Date(b.date).getTime()-new Date(a.date).getTime()) this.setState({data: data}); + console.log(this.state.data) }) .catch((error) => console.error(error)) } diff --git a/app/Staff.js b/app/Staff.js index ca629ff..623d166 100644 --- a/app/Staff.js +++ b/app/Staff.js @@ -33,13 +33,13 @@ import I18n from './i18n'; const Stack = createStackNavigator(); -export const StaffInfo = ({route}) => { +/*export const StaffInfo = ({route}) => { const item = route.params; console.log(item); return ( - /* + {item.emails.map(email => @@ -50,10 +50,10 @@ export const StaffInfo = ({route}) => { )} - */ + - + {item.name} {item.position || ""} @@ -91,21 +91,32 @@ export const StaffInfo = ({route}) => { } ) -} +}*/ function StaffElement (props) { const item = props.item; + const [expand, setExpand] = useState(false); + return( - - props.navigation.navigate('StaffInfo', {data:props.data,name:props.name,emails:item.emails})} activeOpacity={0.8}> - - - - {props.item.name} - - - - - + + setExpand(!expand)}> + + + + {item.name} + {expand?:} + + + {expand? + + Email + {item.email} + {'\n'}Phone Number + {item.phone} + {'\n'}Position + {item.position} + :<>} + + ) } @@ -132,18 +143,6 @@ function Staff () { headerTitleAlign: 'center' })} /> - ({ - title:route.params.name, - headerTitleStyle:[morestyles.headerTitle,{alignSelf:'center'}], - headerBackground: ()=>background, - headerBackTitleVisible:false, - headerTintColor: 'black', - headerTitleAlign: 'center', - })} - /> ) diff --git a/app/StudentWeek.js b/app/StudentWeek.js index 2476f6e..bd6cafe 100644 --- a/app/StudentWeek.js +++ b/app/StudentWeek.js @@ -75,15 +75,16 @@ class StudentWeek extends React.Component { ) } else { - console.log(this.state.data[this.state.data.length-1].image) - const iconURI = this.state.data[this.state.data.length-1].image !== undefined?`data:image/png;charset=utf-8;base64,${this.state.data[this.state.data.length-1].image}`:''; + //const iconURI = this.state.data[this.state.data.length-1].image !== undefined?`data:image/png;charset=utf-8;base64,${this.state.data[this.state.data.length-1].image}`:''; const hobbyText = ({this.state.data[this.state.data.length-1].hobbies}) const achievementText = ({this.state.data[this.state.data.length-1].achievements}) const messageText = ({this.state.data[this.state.data.length-1].messages}) return ( + - + + {this.state.data[this.state.data.length-1].name} {I18n.t('student.Grade')} {this.state.data[this.state.data.length-1].grade} diff --git a/cms/migrations/setup/up.sql b/cms/migrations/setup/up.sql index 3c690a1..1ba6737 100644 --- a/cms/migrations/setup/up.sql +++ b/cms/migrations/setup/up.sql @@ -23,8 +23,7 @@ CREATE TABLE teachers ( name VARCHAR NOT NULL, email VARCHAR NOT NULL, phone VARCHAR NOT NULL, - position VARCHAR NOT NULL, - image VARCHAR + position VARCHAR NOT NULL ); CREATE TABLE announcements ( @@ -75,6 +74,7 @@ CREATE TABLE new ( lang VARCHAR, image VARCHAR, name VARCHAR NOT NULL, + text VARCHAR NOT NULL, new_date DATE ); diff --git a/cms/src/data/mod.rs b/cms/src/data/mod.rs index 02362c6..45cb427 100644 --- a/cms/src/data/mod.rs +++ b/cms/src/data/mod.rs @@ -164,7 +164,6 @@ api_route! { email: (Text, String, String), phone: (Text, String, String), position: (Text, String, String), - image: (Text, String, Image), } } @@ -221,6 +220,7 @@ api_route! { new { image: (Text, String, Image), name: (Text, String, String), + text: (Text, String, String), new_date: (Date, NaiveDate, DateForm), } } diff --git a/cms/templates/new.html.hbs b/cms/templates/new.html.hbs index c703bc0..87730e8 100644 --- a/cms/templates/new.html.hbs +++ b/cms/templates/new.html.hbs @@ -29,6 +29,7 @@ ID: {{id}} | LANG: {{lang}}

{{name}}

{{image}}

+

{{text}}

{{new_date}}

@@ -71,13 +72,22 @@
-

Information

+

Title

+
+
+

Information

+
+
+ +
+
+

Date of What's New Item

@@ -124,13 +134,22 @@
-

Information

+

Title

+
+
+

Information

+
+
+ +
+
+

Date of What's New Item

diff --git a/cms/templates/teachers.html.hbs b/cms/templates/teachers.html.hbs index 61386e8..5cdf261 100644 --- a/cms/templates/teachers.html.hbs +++ b/cms/templates/teachers.html.hbs @@ -31,7 +31,6 @@

{{email}}

{{phone}}

{{position}}

-

{{image}}

@@ -98,15 +97,6 @@
-
-
-

Staff Picture

-
-
- -
-
-
@@ -169,15 +159,6 @@
-
-
-

Staff Picture

-
-
- -
-
-