Merge branch 'feature/zhangleyuan/20201124/cloud-class_third-stage' into dev

b12de365 · zhangleyuan · c3832b56 · 8a728c55 · b12de365 · b12de365
Commit b12de365 authored Jan 17, 2021 by zhangleyuan
17 changed files
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -62,7 +62,7 @@
    "less-loader": "^6.2.0",
    "microevent": "^1.0.0",
    "mini-css-extract-plugin": "0.9.0",
-    "moment": "^2.27.0",
+    "moment": "^2.20.1",
    "optimize-css-assets-webpack-plugin": "5.0.3",
    "photoclip": "^3.4.8",
    "pnp-webpack-plugin": "1.6.4",

--- a/src/bu-components/ShareLiveModal.jsx
+++ b/src/bu-components/ShareLiveModal.jsx
@@ -117,7 +117,6 @@ class ShareLiveModal extends React.Component {
          >{`【${courseName}】开课啦，快来学习！`}</div>
          <img
            src={coverImgSrc}
-            crossOrigin="*"
            className="course-cover"
            alt="course-cover"
          />

--- a/src/components/MultipleDatePicker.jsx
+++ b/src/components/MultipleDatePicker.jsx
@@ -9,7 +9,6 @@ import React from 'react'
 import { message } from "antd";
 import moment from 'moment';
 require("./MultipleDatePicker.less");
 class MultipleDatePicker extends React.Component {
  constructor(props) {
    super(props);

--- a/src/domains/basic-domain/constants.ts
+++ b/src/domains/basic-domain/constants.ts
 /*
 * @Author: 陈剑宇
 * @Date: 2020-05-07 14:43:01
- * @LastEditTime: 2021-01-14 19:31:30
+ * @LastEditTime: 2021-01-16 18:00:10
 * @LastEditors: zhangleyuan
 * @Description: 
 * @FilePath: /wheat-web-demo/src/domains/basic-domain/constants.ts
@@ -9,7 +9,7 @@
 import { MapInterface } from '@/domains/basic-domain/interface'
 // 默认是 dev 环境
-const ENV: string = process.env.DEPLOY_ENV || 'rc';
+const ENV: string = process.env.DEPLOY_ENV || 'dev';
 console.log("process.env.DEPLOY_ENV",process)
 const BASIC_HOST_MAP: MapInterface = {
  dev: 'https://dev-heimdall.xiaomai5.com/',

--- a/src/domains/course-domain/constants.ts
+++ b/src/domains/course-domain/constants.ts
@@ -2,12 +2,12 @@
 * @Author: 吴文洁
 * @Date: 2020-08-20 09:21:40
 * @LastEditors: zhangleyuan
- * @LastEditTime: 2021-01-11 15:35:49
+ * @LastEditTime: 2021-01-16 18:00:18
 * @Description: 
 * @Copyright: 杭州杰竞科技有限公司 版权所有
 */
 import { MapInterface } from '@/domains/basic-domain/interface'
-const ENV: string = process.env.DEPLOY_ENV || 'rc';
+const ENV: string = process.env.DEPLOY_ENV || 'dev';
 const appIdMap: MapInterface = {
  dev: 'wx3ea60e78ddfa277e',

--- a/src/modules/common/DateRangePicker.jsx
+++ b/src/modules/common/DateRangePicker.jsx
@@ -13,13 +13,12 @@ class DateRangePicker extends React.Component {
  }
  render() {
-    const showTime = { showTime: true }
+    const showTime = { showTime: false }
    return (
      <RangePicker
        {...this.props}
        format={this.props.format || 'YYYY-MM-DD'}
        allowClear={this.props.allowClear}
-        ranges={this.props.ranges || { '本月': [moment().startOf('month'), moment().endOf('month')], '本周': [moment().startOf('week'), moment().endOf('week')], '上月': [moment().subtract(1, 'M').startOf('month'), moment().subtract(1, 'M').endOf('month')], '上周': [moment().subtract(1, 'w').startOf('week'), moment().subtract(1, 'w').endOf('week')] }}
        onChange={(date) => {
          if (!_.isEmpty(date)) {
            date[0] = date[0].startOf('day')

--- a/src/modules/course-manage/AddLive.jsx
+++ b/src/modules/course-manage/AddLive.jsx
@@ -82,6 +82,8 @@ class AddLive extends React.Component {
        teacherId: null,
        teacherName: null,
        assistant:[],
+        assistantStoreUserId:[],
+        assistantNames:[],
        liveDate: null,
        timeHorizonStart: null,
        timeHorizonEnd: null,
@@ -169,6 +171,8 @@ class AddLive extends React.Component {
        const timeHorizonStart = startTime;
        const timeHorizonEnd = endTime;
        const assistant = _.pluck(admins, "adminId");
+        const assistantStoreUserId =  _.pluck(admins, "adminStoreUserId"); //编辑时的选中的助教的查询用storeUserId查询
+        const assistantNames =  _.pluck(admins, "adminName");
        const addLiveClassInfo = {
          assistant,
          liveDate,
@@ -179,6 +183,8 @@ class AddLive extends React.Component {
          timeHorizonEnd,
          startTime,
          endTime,
+          assistantNames,
+          assistantStoreUserId
        }
        // liveCourseMediaRequests = liveCourseMediaRequests.length
@@ -220,16 +226,21 @@ handleChangeBasicInfo = (field, value) => {
 }
  // 修改上课信息
-  handleChangeClassInfo = (field, value ,_teacherName) => {
+  handleChangeClassInfo = (field, value ,type, optionValue) => {
    const _value = value ? value.valueOf() : null;
    const { teacherName } = this.state.addLiveClassInfo;
+    const { assistantNames } = this.state.addLiveClassInfo;
+    const { assistantStoreUserId } = this.state.addLiveClassInfo
    this.setState({
      addLiveClassInfo: {
        ...this.state.addLiveClassInfo,
        [field]: _value, 
-        teacherName:_teacherName?_teacherName:teacherName
+        teacherName:type==='teacherType'?optionValue:teacherName,
+        assistantNames:type==='assistantType'?_.pluck(optionValue, "children"):assistantNames,
+        assistantStoreUserId:type==='assistantType'?_.pluck(optionValue, "key"):assistantStoreUserId,
      }
    });
    // 批量开始时间改变，结束时间自动同步一致
    if (field === 'startTime') {
      this.setState({
@@ -444,7 +455,7 @@ handleChangeBasicInfo = (field, value) => {
        }
      }
      if(!teacherId){
-          message.warning('请选择上课老师');
+          message.warning('请选择讲师');
          resolve(false);
          return; 
      }

--- a/src/modules/course-manage/DataList/DataList.less
+++ b/src/modules/course-manage/DataList/DataList.less
@@ -95,6 +95,9 @@
    &.avatar-name-phone {
      justify-content: flex-start;
      padding-left: 26px;
+      .avatar{
+        border-radius:50%;
+      }
      .name {
        height: 22px;
        font-size: 16px;

--- a/src/modules/course-manage/components/AddLiveClass.jsx
+++ b/src/modules/course-manage/components/AddLiveClass.jsx
@@ -48,12 +48,18 @@ class AddLiveClass extends React.Component {
    this.getTeacherList();
    this.getAssistantList();
  }
+  componentWillReceiveProps(nextProps) {
+    if(nextProps.data.assistantStoreUserId.length > 0) {
+      // 获取助教老师列表
+      this.getAssistantList(1, nextProps.data.assistantStoreUserId);
+    }
+  }
  getTeacherList(current = 1, selectList){
    const { teacherQuery,teacherList} = this.state;
    const _query = {
      ...teacherQuery,
      current,
-      size:10
+      size:15
    };
    StoreService.getStoreUserBasicPage( _query).then((res) => {
        const { result = {} } = res;
@@ -68,10 +74,13 @@ class AddLiveClass extends React.Component {
  // 获取助教老师列表
  getAssistantList = (current = 1, selectList) => {
    const { assistantQuery,assistantList} = this.state;
+    const { assistantStoreUserId } = this.props.data;
+    const idList = selectList ? selectList : assistantStoreUserId;
    const _query = {
      ...assistantQuery,
      current,
-      size:10
+      idList,
+      size: idList.length <= 10 ? 10 : idList.length + 10
    };
    StoreService.getStoreUserBasicPage( _query).then((res) => {
        const { result = {} } = res;
@@ -134,7 +143,9 @@ class AddLiveClass extends React.Component {
      liveDate,
      timeHorizonStart,
      timeHorizonEnd,
-      assistant
+      assistant,
+      assistantNames,
+      teacherName
    } = data;
    console.log("teacherId",teacherId);
    return (
@@ -241,19 +252,23 @@ class AddLiveClass extends React.Component {
          </div>
          }
-          <div className="teacher">
+          <div className="teacher" id="teacher">
            <span className="label"><span className="require">* </span>讲师：</span>
            <Select
              placeholder="请选择讲师"
+              // key={teacherName}
+              // defaultValue={teacherName}
+              value={teacherName}
              style={{ width: 240, marginTop: 6 }}
              disabled={!isEdit ? true: false}
              showSearch
-              value={teacherId}
              filterOption={(input, option) => option}
              onPopupScroll={this.handleScrollTeacherList}
              onChange={(value,option) => {
-                this.props.onChange('teacherId', value,option.children) 
+                console.log("value",value);
+                this.props.onChange('teacherId',value,'teacherType',option.children) 
              }}
              onSearch={(value) => {
                teacherQuery.nickName = value
                this.setState({
@@ -262,6 +277,9 @@ class AddLiveClass extends React.Component {
                  this.getTeacherList()
                })
              }}
+              getPopupContainer={() =>
+                document.getElementById("teacher")
+              }
            >
              {_.map(teacherList, (item, index) => {
                if( !assistant.includes(item.userId) ){
@@ -271,12 +289,15 @@ class AddLiveClass extends React.Component {
                }
              })}
            </Select>
          </div>
-          <div className="assistant-teacher">
+          <div className="assistant-teacher" id="assistant-teacher">
                <span className="label">助教：</span>
                <Select
                  id="assistant"
                  placeholder="请选择助教老师"
+                  // key={assistantNames}
+                  // defaultValue={assistantNames}
                  value={assistant}
                  disabled={!isEdit ? true: false}
                  mode={'multiple'}
@@ -285,8 +306,9 @@ class AddLiveClass extends React.Component {
                  style={{ width: 240, marginTop: 6 }}
                  filterOption={(input, option) => option}
                  onPopupScroll={this.handleScrollAssistantList}
-              onChange={(value) => {
+                  onChange={(value,option) => {
-                this.props.onChange('assistant', value) 
+                    console.log('option',option);
+                    this.props.onChange('assistant',value,'assistantType',option) 
                  }}
                  onSearch={(value) => {
                    assistantQuery.nickName = value
@@ -296,11 +318,14 @@ class AddLiveClass extends React.Component {
                      this.getAssistantList()
                    })
                  }}
+                  getPopupContainer={() =>
+                    document.getElementById("assistant-teacher")
+                  }
                >
                {_.map(assistantList, (item, index) => {
                  if(item.userId !== teacherId){
                    return (
-                    <Select.Option value={item.userId} key={item.userId}>{item.nickName}</Select.Option>
+                      <Select.Option value={item.userId} key={item.id}>{item.nickName}</Select.Option>
                    );
                  }

--- a/src/modules/course-manage/components/LiveCourseFilter.jsx
+++ b/src/modules/course-manage/components/LiveCourseFilter.jsx
@@ -15,6 +15,7 @@ import TeacherSearchSelect from "@/modules/common/TeacherSearchSelect";
 import RangePicker from "@/modules/common/DateRangePicker";
 import moment from 'moment';
 import StoreService from "@/domains/store-domain/storeService";
+import User from '@/common/js/user';
 import './LiveCourseFilter.less';
 const { Search } = Input;
@@ -126,7 +127,6 @@ class LiveCourseFilter extends React.Component {
  handleReset = () => {
    this.setState({
      query: {
-        ...this.state.query,
        courseName: null,
        startTime: null,
        endTime: null,
@@ -134,6 +134,7 @@ class LiveCourseFilter extends React.Component {
        teacherName: null,
        courseState: undefined,
        current: 1,
+        shelfState:null,
      },
    }, () => {
      this.props.onChange(this.state.query);
@@ -174,8 +175,10 @@ class LiveCourseFilter extends React.Component {
                  format={"YYYY-MM-DD"}
                  onChange={(dates) => { this.handleChangeDates(dates) }}
                  style={{ width: "calc(100% - 70px)" }}
                />
              </div>
+              { User.getUserRole()!=="CloudLecturer" &&
              <div className="search-condition__item">
                 <span>讲师：</span>
                  <Select
@@ -187,7 +190,7 @@ class LiveCourseFilter extends React.Component {
                    onPopupScroll={this.handleScrollTeacherList}
                    value={teacherId}
                    onChange={(value) => {
-                      this.handleChangeQuery('teacherId', value) 
+                      this.handleChangeQuery('teacherId', value);
                    }}
                    onSearch={(value) => {
                      teacherQuery.nickName = value
@@ -197,6 +200,18 @@ class LiveCourseFilter extends React.Component {
                        this.getTeacherList()
                      })
                    }}
+                    onClear ={(value)=>{
+                        this.setState({
+                          teacherQuery:{
+                            size: 10,
+                            current: 1,
+                            nickName:null
+                          }
+                        }, () => {
+                          this.getTeacherList()
+                        })
+                      }
+                    }
                  >
                    {_.map(teacherList, (item, index) => {
                      return (
@@ -205,8 +220,8 @@ class LiveCourseFilter extends React.Component {
                    })}
                  </Select>
              </div>
+              }
-              { expandFilter &&
+              { ((expandFilter && User.getUserRole()!=="CloudLecturer") || User.getUserRole()==="CloudLecturer")  &&
                <div className="search-condition__item">
                  <span className="select-status">上课状态：</span>
                  <Select

--- a/src/modules/course-manage/components/LiveCourseList.jsx
+++ b/src/modules/course-manage/components/LiveCourseList.jsx
@@ -166,24 +166,47 @@ class LiveCourseList extends React.Component {
                  <img className="course-cover" src={'https://image.xiaomaiketang.com/xm/YNfi45JwFA.png'} />
                }
                <div>
+                    { record.courseName.length > 17?
+                      <Tooltip title={record.courseName}>
                        <div className="course-name">{record.courseName}</div>
+                      </Tooltip>
+                      :
+                      <div className="course-name">{record.courseName}</div>
+                    }
                   <div>
                      <span className="course-time">{formatDate("YYYY-MM-DD H:i",parseInt(record.startTime))}~{formatDate("H:i", parseInt(record.endTime))}</span>
                      <span className="course-status" style={{color:courseStateShow[record.courseState].color,border:`1px solid ${courseStateShow[record.courseState].color}`}}>{courseStateShow[record.courseState].title}</span>
                   </div>
                   <div className="teacher-assistant">
+                    { record.teacherName.length > 4 ?
+                        <Tooltip title={record.teacherName}>
                          <span className="teacher">讲师：{record.teacherName}</span>
+                        </Tooltip>
+                        :
+                        <span className="teacher">讲师：{record.teacherName}</span>
+                      }
                      { record.admins.length >0 &&
                        <>
                          <span  className="split"> | </span>
+                          { this.handleAdminName(record.admins).length > 4?
+                              <Tooltip title={this.handleAdminName(record.admins)}>
                                 <span className="assistant">助教：
                                  { record.admins.map((item,index)=>{
                                      return <span>{item.adminName} { (index < record.admins.length-1)&&(<span> 、</span>)} </span>
                                    })
                                  }
                                </span>
+                              </Tooltip>
+                              :
+                              <span className="assistant">助教：
+                                { record.admins.map((item,index)=>{
+                                    return <span>{item.adminName} { (index < record.admins.length-1)&&(<span> 、</span>)} </span>
+                                  })
+                                }
+                              </span>
+                          }
                        </>
                      }
                   </div>
@@ -236,7 +259,7 @@ class LiveCourseList extends React.Component {
        {
          title: <span>
            <span>店铺展示</span>
-            <Tooltip title="开启后，用户可在店铺内查看到此课程。若课程“未成功开课”，则系统会自动“关闭”店铺展示。关闭后，店铺内不再展示此课程，但用户仍可通过分享的海报/链接查看此课程。"><i className="icon iconfont" style={{ marginLeft: '5px',cursor:'pointer',color:'#bfbfbf'}}>&#xe61d;</i></Tooltip>
+            <Tooltip  title={<div>开启后，用户可在店铺内查看到此课程。若课程“未成功开课”，则系统会自动“关闭”店铺展示。<br/>关闭后，店铺内不再展示此课程，但用户仍可通过分享的海报/链接查看此课程。</div>}><i className="icon iconfont" style={{ marginLeft: '5px',cursor:'pointer',color:'#bfbfbf'}}>&#xe61d;</i></Tooltip>
          </span>,
          width: "7%",
          dataIndex: "courseware",
@@ -266,7 +289,7 @@ class LiveCourseList extends React.Component {
                  <span className="operate__item split" key="view_play_back_split"> | </span>
                  </>
                }
-                { (item.courseState==="FINISH" || item.haveRecord==="YES") && 
+                { (item.courseState==="FINISH" && item.haveRecord==="YES") && 
                    <>
                      <div
@@ -342,24 +365,47 @@ class LiveCourseList extends React.Component {
                  <img className="course-cover" src={'https://image.xiaomaiketang.com/xm/YNfi45JwFA.png'} />
                }
                <div>
+                    { record.courseName.length > 17?
+                      <Tooltip title={record.courseName}>
+                        <div className="course-name">{record.courseName}</div>
+                      </Tooltip>
+                      :
                      <div className="course-name">{record.courseName}</div>
+                    }
                   <div>
                      <span className="course-time">{formatDate("YYYY-MM-DD H:i",parseInt(record.startTime))}~{formatDate("H:i", parseInt(record.endTime))}</span>
                      <span className="course-status" style={{color:courseStateShow[record.courseState].color,border:`1px solid ${courseStateShow[record.courseState].color}`}}>{courseStateShow[record.courseState].title}</span>
                   </div>
                   <div className="teacher-assistant">
+                   { record.teacherName.length > 4 ?
+                      <Tooltip title={record.teacherName}>
                        <span className="teacher">讲师：{record.teacherName}</span>
+                      </Tooltip>
+                      :
+                      <span className="teacher">讲师：{record.teacherName}</span>
+                    }
                      { record.admins.length >0 &&
                        <>
                          <span  className="split"> | </span>
+                          { this.handleAdminName(record.admins).length > 4?
+                              <Tooltip title={this.handleAdminName(record.admins)}>
                                 <span className="assistant">助教：
                                  { record.admins.map((item,index)=>{
                                      return <span>{item.adminName} { (index < record.admins.length-1)&&(<span> 、</span>)} </span>
                                    })
                                  }
                                </span>
+                              </Tooltip>
+                              :
+                              <span className="assistant">助教：
+                                { record.admins.map((item,index)=>{
+                                    return <span>{item.adminName} { (index < record.admins.length-1)&&(<span> 、</span>)} </span>
+                                  })
+                                }
+                              </span>
+                          }
                        </>
                      }
                   </div>
@@ -416,6 +462,17 @@ class LiveCourseList extends React.Component {
    this.setState({ columns })
  }
+  handleAdminName = (adminArray)=>{
+    let adminStr = "";
+    adminArray.map((item,index)=>{
+      if(index < adminArray.length-1){
+        adminStr = adminStr + item.adminName + '、';
+      }else{
+        adminStr = adminStr + item.adminName
+      }
+    })
+    return adminStr
+  }
  renderMoreOperate = (item) => {
    return (
      <div className="live-course-more-menu">

--- a/src/modules/course-manage/components/LiveCourseList.less
+++ b/src/modules/course-manage/components/LiveCourseList.less
@@ -17,7 +17,7 @@
      color: #333333;
      line-height: 20px;
      font-weight: bold;
-      max-width:238px;
+      max-width:244px;
      overflow: hidden;
      text-overflow:ellipsis;
      white-space: nowrap;
@@ -126,8 +126,14 @@
      font-size: 12px;
    }
  }
-}
+}
+.ant-tooltip{
+  max-width:700px !important;
+}
+.ant-tooltip-inner{
+  max-width:700px !important;
+}
 .live-course-more-menu {
  background: white;
  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.15);

--- a/src/modules/course-manage/modal/ShareLiveModal.jsx
+++ b/src/modules/course-manage/modal/ShareLiveModal.jsx
@@ -121,7 +121,6 @@ class ShareLiveModal extends React.Component {
          <img
            src={coverImgSrc}
-            crossOrigin="*"
            className="course-cover"
          />

--- a/src/modules/course-manage/video-course/components/VideoCourseFilter.jsx
+++ b/src/modules/course-manage/video-course/components/VideoCourseFilter.jsx
@@ -2,7 +2,7 @@
 * @Author: 吴文洁
 * @Date: 2020-08-05 10:11:57
 * @LastEditors: zhangleyuan
- * @LastEditTime: 2021-01-09 11:50:00
+ * @LastEditTime: 2021-01-15 13:52:10
 * @Description: 视频课-搜索模块
 * @Copyright: 杭州杰竞科技有限公司 版权所有
 */
@@ -166,6 +166,18 @@ class VideoCourseFilter extends React.Component {
                    this.getTeacherList()
                  })
                }}
+                onClear ={(value)=>{
+                  this.setState({
+                    teacherQuery:{
+                      size: 10,
+                      current: 1,
+                      nickName:null
+                    }
+                  }, () => {
+                    this.getTeacherList()
+                  })
+                }
+              }
              >
                {_.map(teacherList, (item, index) => {
                  return (

--- a/src/modules/course-manage/video-course/components/VideoCourseList.jsx
+++ b/src/modules/course-manage/video-course/components/VideoCourseList.jsx
@@ -2,7 +2,7 @@
 * @Author: 吴文洁
 * @Date: 2020-08-05 10:12:45
 * @LastEditors: zhangleyuan
- * @LastEditTime: 2021-01-14 19:34:09
+ * @LastEditTime: 2021-01-15 19:58:12
 * @Description: 视频课-列表模块
 * @Copyright: 杭州杰竞科技有限公司 版权所有
 */
@@ -23,7 +23,7 @@ import User from '@/common/js/user'
 import './VideoCourseList.less';
-const ENV = process.env.DEPLOY_ENV || 'rc';
+const ENV = process.env.DEPLOY_ENV || 'dev';
 class VideoCourseList extends React.Component {
@@ -75,7 +75,13 @@ class VideoCourseList extends React.Component {
            <div className="record__item">
              {/* 上传了封面的话就用上传的封面, 没有的话就取视频的第一帧 */}
              <img className="course-cover" src={coverUrl || `${scheduleVideoUrl}?x-oss-process=video/snapshot,t_0,m_fast`} />
-              <span className="course-name">{record.courseName}</span>
+              { record.courseName.length > 25?
+                <Tooltip title={record.courseName}>
+                  <div className="course-name">{record.courseName}</div>
+                </Tooltip>
+                :
+                <div className="course-name">{record.courseName}</div>
+              }
            </div>
          )
        }
@@ -115,7 +121,7 @@ class VideoCourseList extends React.Component {
      {
        title: <span>
          <span>店铺展示</span>
-          <Tooltip title="开启后，用户可在店铺内查看到此课程。若课程“未成功开课”，则系统会自动“关闭”店铺展示。关闭后，店铺内不再展示此课程，但用户仍可通过分享的海报/链接查看此课程。"><i className="icon iconfont" style={{ marginLeft: '5px',cursor:'pointer',color:'#bfbfbf'}}>&#xe61d;</i></Tooltip>
+          <Tooltip  title={<div>开启后，用户可在店铺内查看到此课程。若课程“未成功开课”，则系统会自动“关闭”店铺展示。<br/>关闭后，店铺内不再展示此课程，但用户仍可通过分享的海报/链接查看此课程。</div>}><i className="icon iconfont" style={{ marginLeft: '5px',cursor:'pointer',color:'#bfbfbf'}}>&#xe61d;</i></Tooltip>
        </span>,
        width: "7%",
        dataIndex: "courseware",

--- a/src/modules/course-manage/video-course/components/VideoCourseList.less
+++ b/src/modules/course-manage/video-course/components/VideoCourseList.less
@@ -34,6 +34,13 @@
    .course-name {
      color: #666;
+      width:188px;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      display: -webkit-box;
+      -webkit-line-clamp: 2;
+      -webkit-box-orient: vertical;
+      height:48px;
    }
  }
 }
@@ -51,3 +58,9 @@
    }
  }
 }
+.ant-tooltip{
+  max-width:700px !important;
+}
+.ant-tooltip-inner{
+  max-width:700px !important;
+}
\ No newline at end of file