test

aerain · Mar 19, 2019 · c975809 · c975809
1 parent 0bb4b9d
commit c975809
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 8 deletions.
diff --git a/activity/JedaeroAPI/HaksaAPI.js b/activity/JedaeroAPI/HaksaAPI.js
@@ -16,9 +16,10 @@ export default function () {
                     schedule: []
                 };
                 eachMonth["month_title"] = $(this).find('caption').text();
-                $(this).find('tr > td').each(function() {
+                $(this).find('tr > td').each(function(index) {
                     let day = {};
                     let temp = $(this).text().replace(/(\s*~\s*)/gi, ' ~ ').replace(/(^\s*)|(\s*$)/g, '');
+                    day["key"] = toString(index);
                     day["haksa"] = temp;
                     eachMonth.schedule.push(day);
                 });

diff --git a/activity/css/busStyle.js b/activity/css/busStyle.js
@@ -88,6 +88,13 @@ const mainScreen = StyleSheet.create({
         marginTop: -5
 
     },
+    swiperStyle: {
+        flex: null
+    },
+    swiperContainerStyle: {
+        flex: null
+    },
+
     foodBlockContainerTitle: {
         fontWeight: 'bold',
         fontSize: normalize(12)

diff --git a/activity/drawer/bus/bus.js b/activity/drawer/bus/bus.js
@@ -60,11 +60,11 @@ export default class Bus extends Component {
         return (
             <ScrollView contentContainerStyle={mainScreen.busView} >
             <Bustime name="버스 시간" />
-                    {/* <Swiper style={{ width: Dimensions.get('window').width, height: 70 }}  showsPagination={false}> */}
-                <FoodBlock name="오늘의 학식" food={this.state.haksik} onRefresh={() => this.getHaksik(true)}/>
-                <DormBlock name="오늘의 숙사밥" food={this.state.dormitory} onRefresh={() => this.getDormitory(true)}/>
-                    {/* </Swiper> */}
-                    <SmartBlock name="스마트 출첵1111" />
+                {/* <Swiper style={mainScreen.swiperStyle} containerStyle={mainScreen.swiperContainerStyle} showsPagination={false}> */}
+                    <FoodBlock name="오늘의 학식" food={this.state.haksik} onRefresh={() => this.getHaksik(true)}/>
+                    <DormBlock name="오늘의 숙사밥" food={this.state.dormitory} onRefresh={() => this.getDormitory(true)}/>
+                {/* </Swiper> */}
+                    {/* <SmartBlock name="스마트 출첵" /> */}
             </ScrollView>
         )
     }

diff --git a/activity/drawer/schedule/Schedule.js b/activity/drawer/schedule/Schedule.js
@@ -40,7 +40,7 @@ class Schedule extends Component {
             >
                 <Text style={haksaStyles.calendarMonth}>{month}</Text>
                 <Text>월</Text>
-                {(isNextYear) ? (<Text>{new Date().getFullYear() + 1}</Text>) : null}
+                {(isNextYear) ? (<Text>{new Date().getFullYear() + 1}년</Text>) : null}
             </TouchableOpacity>
             // <ListItem 
             //     key={item['month_title']}

diff --git a/activity/drawer/schedule/ScheduleDetail.js b/activity/drawer/schedule/ScheduleDetail.js
@@ -16,8 +16,9 @@ export default class ScheduleDetail extends Component {
         };
     }
 
+    _keyExtractor = (item, index) => item.key;
     _renderItem = ({item, index}) => (
-        <View key={index} style={{paddingVertical: 16, paddingHorizontal: 8, borderBottomColor:'#d7d7d7', borderBottomWidth: 0.5}}>
+        <View style={{paddingVertical: 16, paddingHorizontal: 8, borderBottomColor:'#d7d7d7', borderBottomWidth: 0.5}}>
             <Text style={{textAlign:'center', fontSize:(index % 2 == 0 ? normalize(18) : normalize(14))}}>{item.haksa}</Text>
         </View>
     )
@@ -28,6 +29,7 @@ export default class ScheduleDetail extends Component {
         return (
             <View style={{flex: 1, backgroundColor:'#ffffff'}}>
                 <FlatList 
+                    keyExtractor={this._keyExtractor}
                     data={schedule}
                     renderItem={this._renderItem}
                 />