Commit 54de23f2 authored by Marlon Ulloa Amaya's avatar Marlon Ulloa Amaya

cliente sistemas de consejerias

parents
This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app).
## Available Scripts
In the project directory, you can run:
### `npm start`
Runs the app in the development mode.<br>
Open [http://localhost:3000](http://localhost:3000) to view it in the browser.
The page will reload if you make edits.<br>
You will also see any lint errors in the console.
### `npm test`
Launches the test runner in the interactive watch mode.<br>
See the section about [running tests](https://facebook.github.io/create-react-app/docs/running-tests) for more information.
### `npm run build`
Builds the app for production to the `build` folder.<br>
It correctly bundles React in production mode and optimizes the build for the best performance.
The build is minified and the filenames include the hashes.<br>
Your app is ready to be deployed!
See the section about [deployment](https://facebook.github.io/create-react-app/docs/deployment) for more information.
### `npm run eject`
**Note: this is a one-way operation. Once you `eject`, you can’t go back!**
If you aren’t satisfied with the build tool and configuration choices, you can `eject` at any time. This command will remove the single build dependency from your project.
Instead, it will copy all the configuration files and the transitive dependencies (Webpack, Babel, ESLint, etc) right into your project so you have full control over them. All of the commands except `eject` will still work, but they will point to the copied scripts so you can tweak them. At this point you’re on your own.
You don’t have to ever use `eject`. The curated feature set is suitable for small and middle deployments, and you shouldn’t feel obligated to use this feature. However we understand that this tool wouldn’t be useful if you couldn’t customize it when you are ready for it.
## Learn More
You can learn more in the [Create React App documentation](https://facebook.github.io/create-react-app/docs/getting-started).
To learn React, check out the [React documentation](https://reactjs.org/).
### Code Splitting
This section has moved here: https://facebook.github.io/create-react-app/docs/code-splitting
### Analyzing the Bundle Size
This section has moved here: https://facebook.github.io/create-react-app/docs/analyzing-the-bundle-size
### Making a Progressive Web App
This section has moved here: https://facebook.github.io/create-react-app/docs/making-a-progressive-web-app
### Advanced Configuration
This section has moved here: https://facebook.github.io/create-react-app/docs/advanced-configuration
### Deployment
This section has moved here: https://facebook.github.io/create-react-app/docs/deployment
### `npm run build` fails to minify
This section has moved here: https://facebook.github.io/create-react-app/docs/troubleshooting#npm-run-build-fails-to-minify
This diff is collapsed.
{
"name": "cliente",
"version": "0.1.0",
"private": true,
"dependencies": {
"@material-ui/core": "^3.9.3",
"@material-ui/icons": "^3.0.2",
"bootstrap": "^4.3.1",
"btoa": "^1.2.1",
"d3": "5.8.2",
"glyphicons-only-bootstrap": "^1.0.1",
"jquery": "^3.3.1",
"mui-datatables": "^2.0.0-beta.59",
"popper.js": "^1.14.7",
"react": "^16.7.0",
"react-dom": "^16.7.0",
"react-helmet": "^5.2.0",
"react-scripts": "2.1.3",
"react-switch": "^4.1.0",
"react-virtualized": "^9.21.0",
"request": "^2.88.0",
"request-promise": "^4.2.2",
"request-promise-native": "^1.0.5",
"uninstall": "0.0.0"
},
"scripts": {
"start": "PORT=3001 react-scripts start",
"build": "react-scripts build",
"test": "react-scripts test",
"eject": "react-scripts eject"
},
"eslintConfig": {
"extends": "react-app"
},
"browserslist": [
">0.2%",
"not dead",
"not ie <= 11",
"not op_mini all"
],
"proxy": "http://localhost:3000"
}
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8" />
<link rel="shortcut icon" href="%PUBLIC_URL%/images/LogoU.gif" />
<meta
name="viewport"
content="width=device-width, initial-scale=1, shrink-to-fit=no"
/>
<meta name="theme-color" content="#000000" />
<!--
manifest.json provides metadata used when your web app is added to the
homescreen on Android. See https://developers.google.com/web/fundamentals/web-app-manifest/
-->
<link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
<!--
Notice the use of %PUBLIC_URL% in the tags above.
It will be replaced with the URL of the `public` folder during the build.
Only files inside the `public` folder can be referenced from the HTML.
Unlike "/favicon.ico" or "favicon.ico", "%PUBLIC_URL%/favicon.ico" will
work correctly both with client-side routing and a non-root public URL.
Learn how to configure a non-root public URL by running `npm run build`.
-->
<title>LALA_UCuenca | Sistema de Consejerías Académicas</title>
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
<!--para los iconos de bootstrap en los span-->
<!-- <link href="//netdna.bootstrapcdn.com/bootstrap/3.0.0/css/bootstrap-glyphicons.css" rel="stylesheet"> -->
<!--<link href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet">
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
<script src="https://d3js.org/d3.v3.min.js"></script>
<script src="https://d3js.org/queue.v1.min.js"></script>
-->
</head>
<body>
<noscript>You need to enable JavaScript to run this app.</noscript>
<!--<script src="https://code.jquery.com/jquery-3.3.1.min.js"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.2/js/bootstrap.min.js"></script>
-->
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.4.0/js/bootstrap.min.js"></script>
<div class="fluid-container" id="root"></div>
<!--
This HTML file is a template.
If you open it directly in the browser, you will see an empty page.
You can add webfonts, meta tags, or analytics to this file.
The build step will place the bundled scripts into the <body> tag.
To begin the development, run `npm start` or `yarn start`.
To create a production bundle, use `npm run build` or `yarn build`.
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.2/css/bootstrap.min.css">
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.2/js/bootstrap.min.js"></script>
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
<script src="https://d3js.org/d3.v3.min.js" async defer></script>
<script src="https://d3js.org/queue.v1.min.js"></script>
-->
</body>
</html>
{
"short_name": "React App",
"name": "Create React App Sample",
"icons": [
{
"src": "favicon.ico",
"sizes": "64x64 32x32 24x24 16x16",
"type": "image/x-icon"
}
],
"start_url": ".",
"display": "standalone",
"theme_color": "#000000",
"background_color": "#ffffff"
}
export function react(){
const square = d3.selectAll("rect");
square.style("fill", "orange");
var yAxiss = d3.svg.axis()
.scale(y)
.orient("left")
.ticks(8)
.tickSize(-15, 0, 0)
.tickFormat(d3.format(".2s"));
}
\ No newline at end of file
.App {
text-align: center;
}
.App-logo {
animation: App-logo-spin infinite 20s linear;
height: 40vmin;
}
.App-header {
background-color: #282c34;
min-height: 100vh;
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
font-size: calc(10px + 2vmin);
color: white;
}
.App-link {
color: #61dafb;
}
.logo{
width: 2em;
height: 100%;
}
.titleNavBar{
font-size: 130%;
}
@keyframes App-logo-spin {
from {
transform: rotate(0deg);
}
to {
transform: rotate(360deg);
}
}
import React, { Component } from 'react';
import ReactDOM from 'react-dom';
/*import logo from './logo.svg';*/
import './App.css';
import '../node_modules/glyphicons-only-bootstrap/css/bootstrap.min.css';
import {drawC} from './js/test';
import Navigation from './components/Navigation';
import Dashboard from './components/Dashboard';
import Parameter from './components/testParameters';
import * as d3 from 'd3';
//PARA EL NAVBAR QUE FUNCIONE EL RESPONSIVO
import "../node_modules/jquery/dist/jquery.min.js";
import "../node_modules/bootstrap/dist/css/bootstrap.min.css";
import "../node_modules/bootstrap/dist/js/bootstrap.min.js";
class App extends Component {
constructor (){
super();
this.state = {
id: 0,
showDashoboard: false
}
drawC();
}
onChangeInput = (e) => {
this.setState({id: e.target.value});
this.setState({showDashoboard: false});
}
searchButton = (e) => {
e.preventDefault();
if(parseInt(this.state.id)===0 || this.state.id.length === 0){
alert("Ingrese id del estudiante!");
this.setState({showDashoboard: false});
}else{
d3.select('.not-found').style('display', 'none');
let charging = document.getElementById("ipl-progress-indicator");
charging.classList.add("ipl-progress-indicator");
charging.classList.remove("available");
//alert(this.state.id);
this.setState({showDashoboard: true});
// let dash = document.getElementsByClassName(".centro")[0];
// console.log(dash);
// if(dash !== undefined){
// dash.remove();
// }
// charging = document.getElementById("ipl-progress-indicator");
// charging.classList.add("available");
}
}
closeNotFound(){
d3.select('.not-found').style('display', 'none');
}
render() {
return (
/*<div className="App">
<header className="App-header">
<img src={logo} className="App-logo" alt="logo" />
<p>
Edit <code>src/App.js</code> and save to reload.
</p>
<a
className="App-link"
href="https://reactjs.org"
target="_blank"
rel="noopener noreferrer"
>
Learn React
</a>
</header>
</div>*/
//container bootstrap
<div>
{/** <Navigation />*/}
<nav className="navbar navbar-expand-lg navbar-light bg-light">
{/*<a className="navbar-brand" href="#">Navbar</a>*/}
<img src="./images/LogoU.gif" className="logo"></img>
<button className="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
<span className="navbar-toggler-icon"></span>
</button>
<div className="collapse navbar-collapse" id="navbarSupportedContent">
{/*<ul className="navbar-nav mr-auto">
<li className="nav-item active">
<a className="nav-link" href="#">Home <span className="sr-only">(current)</span></a>
</li>
<li className="nav-item">
<a className="nav-link" href="#">Link</a>
</li>
<li className="nav-item dropdown">
<a className="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
Dropdown
</a>
<div className="dropdown-menu" aria-labelledby="navbarDropdown">
<a className="dropdown-item" href="#">Action</a>
<a className="dropdown-item" href="#">Another action</a>
<div className="dropdown-divider"></div>
<a className="dropdown-item" href="#">Something else here</a>
</div>
</li>
<li className="nav-item">
<a className="nav-link disabled" href="#">Disabled</a>
</li>
</ul>*/}
<ul className="navbar-nav mr-auto">
<li className="nav-item">
<label className="titleNavbar" >Sistema de Consejerías Académicas</label>
</li>
</ul>
<form className="form-inline my-2 my-lg-0">
<input className="form-control mr-sm-2" type="search" onChange={(e) => this.onChangeInput(e)} placeholder="id del estudiante" aria-label="Search"/>
<button className="btn btn-outline-success my-2 my-sm-0" onClick={(e) => this.searchButton(e)} type="submit">Buscar</button>
</form>
</div>
</nav>
{/*<div className="container">
<h3 className="name">Juan Andres Perez Vinces</h3>
<h3 className="title">Carrera de Ingenieria de Sistemas</h3>
<div className="inforStudent">Div de informacion de usuario</div>
</div>*/}
<div className="alert alert-danger not-found"><span className="glyphicon glyphicon-remove close-alert" onClick={this.closeNotFound.bind(this)}></span>No existe el estudiante.</div>
<div className="charging" >
<div className="progresss" id="ipl-progress-indicator">
<div className="ipl-progress-indicator-head">
<div className="first-indicator"></div>
<div className="second-indicator"></div>
</div>
<div className="insp-logo-frame">
<img className="loading" src="./images/loadingLogo.gif"></img>
{/*<svg width="112" className="insp-logo-frame-img" height="112" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 841.9 595.3">
<g fill="#61DAFB">
<path d="M666.3 296.5c0-32.5-40.7-63.3-103.1-82.4 14.4-63.6 8-114.2-20.2-130.4-6.5-3.8-14.1-5.6-22.4-5.6v22.3c4.6 0 8.3.9 11.4 2.6 13.6 7.8 19.5 37.5 14.9 75.7-1.1 9.4-2.9 19.3-5.1 29.4-19.6-4.8-41-8.5-63.5-10.9-13.5-18.5-27.5-35.3-41.6-50 32.6-30.3 63.2-46.9 84-46.9V78c-27.5 0-63.5 19.6-99.9 53.6-36.4-33.8-72.4-53.2-99.9-53.2v22.3c20.7 0 51.4 16.5 84 46.6-14 14.7-28 31.4-41.3 49.9-22.6 2.4-44 6.1-63.6 11-2.3-10-4-19.7-5.2-29-4.7-38.2 1.1-67.9 14.6-75.8 3-1.8 6.9-2.6 11.5-2.6V78.5c-8.4 0-16 1.8-22.6 5.6-28.1 16.2-34.4 66.7-19.9 130.1-62.2 19.2-102.7 49.9-102.7 82.3 0 32.5 40.7 63.3 103.1 82.4-14.4 63.6-8 114.2 20.2 130.4 6.5 3.8 14.1 5.6 22.5 5.6 27.5 0 63.5-19.6 99.9-53.6 36.4 33.8 72.4 53.2 99.9 53.2 8.4 0 16-1.8 22.6-5.6 28.1-16.2 34.4-66.7 19.9-130.1 62-19.1 102.5-49.9 102.5-82.3zm-130.2-66.7c-3.7 12.9-8.3 26.2-13.5 39.5-4.1-8-8.4-16-13.1-24-4.6-8-9.5-15.8-14.4-23.4 14.2 2.1 27.9 4.7 41 7.9zm-45.8 106.5c-7.8 13.5-15.8 26.3-24.1 38.2-14.9 1.3-30 2-45.2 2-15.1 0-30.2-.7-45-1.9-8.3-11.9-16.4-24.6-24.2-38-7.6-13.1-14.5-26.4-20.8-39.8 6.2-13.4 13.2-26.8 20.7-39.9 7.8-13.5 15.8-26.3 24.1-38.2 14.9-1.3 30-2 45.2-2 15.1 0 30.2.7 45 1.9 8.3 11.9 16.4 24.6 24.2 38 7.6 13.1 14.5 26.4 20.8 39.8-6.3 13.4-13.2 26.8-20.7 39.9zm32.3-13c5.4 13.4 10 26.8 13.8 39.8-13.1 3.2-26.9 5.9-41.2 8 4.9-7.7 9.8-15.6 14.4-23.7 4.6-8 8.9-16.1 13-24.1zM421.2 430c-9.3-9.6-18.6-20.3-27.8-32 9 .4 18.2.7 27.5.7 9.4 0 18.7-.2 27.8-.7-9 11.7-18.3 22.4-27.5 32zm-74.4-58.9c-14.2-2.1-27.9-4.7-41-7.9 3.7-12.9 8.3-26.2 13.5-39.5 4.1 8 8.4 16 13.1 24 4.7 8 9.5 15.8 14.4 23.4zM420.7 163c9.3 9.6 18.6 20.3 27.8 32-9-.4-18.2-.7-27.5-.7-9.4 0-18.7.2-27.8.7 9-11.7 18.3-22.4 27.5-32zm-74 58.9c-4.9 7.7-9.8 15.6-14.4 23.7-4.6 8-8.9 16-13 24-5.4-13.4-10-26.8-13.8-39.8 13.1-3.1 26.9-5.8 41.2-7.9zm-90.5 125.2c-35.4-15.1-58.3-34.9-58.3-50.6 0-15.7 22.9-35.6 58.3-50.6 8.6-3.7 18-7 27.7-10.1 5.7 19.6 13.2 40 22.5 60.9-9.2 20.8-16.6 41.1-22.2 60.6-9.9-3.1-19.3-6.5-28-10.2zM310 490c-13.6-7.8-19.5-37.5-14.9-75.7 1.1-9.4 2.9-19.3 5.1-29.4 19.6 4.8 41 8.5 63.5 10.9 13.5 18.5 27.5 35.3 41.6 50-32.6 30.3-63.2 46.9-84 46.9-4.5-.1-8.3-1-11.3-2.7zm237.2-76.2c4.7 38.2-1.1 67.9-14.6 75.8-3 1.8-6.9 2.6-11.5 2.6-20.7 0-51.4-16.5-84-46.6 14-14.7 28-31.4 41.3-49.9 22.6-2.4 44-6.1 63.6-11 2.3 10.1 4.1 19.8 5.2 29.1zm38.5-66.7c-8.6 3.7-18 7-27.7 10.1-5.7-19.6-13.2-40-22.5-60.9 9.2-20.8 16.6-41.1 22.2-60.6 9.9 3.1 19.3 6.5 28.1 10.2 35.4 15.1 58.3 34.9 58.3 50.6-.1 15.7-23 35.6-58.4 50.6zM320.8 78.4z"/>
<circle cx="420.9" cy="296.5" r="45.7"/>
<path d="M520.5 78.1z"/>
</g>
</svg>*/}
</div>
</div>
</div>
{this.state.showDashoboard === true ? <Dashboard className="dash-show" idStudent={this.state.id}/>: null}
{/*<Parameter param="hola"/>*/}
{/* <div className="header">
<h2 className="title">
Dynamics of weighted average interest rates on credits extended to businesses
and individuals among the regions of the Central Federal district of Russia
</h2>
<div className="preview"></div>
</div>
<div className="actions">
<label id="form" for="show-voronoi">
Show Voronoi diagram
<input type="checkbox" id="show-voronoi" disabled/>
</label>
<button className="reset-zoom-button">Reset zoom</button>
</div>
<div className="root">
<div className="chart"></div>
<div className="legend"></div>
</div>*/}
</div>
);
}
}
export default App;
import React from 'react';
import ReactDOM from 'react-dom';
import App from './App';
it('renders without crashing', () => {
const div = document.createElement('div');
ReactDOM.render(<App />, div);
ReactDOM.unmountComponentAtNode(div);
});
This diff is collapsed.
import React from 'react';
const NavItem = props => {
const pageURI = window.location.pathname+window.location.search
const liClassName = (props.path === pageURI) ? "nav-item active" : "nav-item";
const aClassName = props.disabled ? "nav-link disabled" : "nav-link"
return (
<li className={liClassName}>
<a href={props.path} className={aClassName}>
{props.name}
{(props.path === pageURI) ? (<span className="sr-only">(current)</span>) : ''}
</a>
</li>
);
}
class NavDropdown extends React.Component {
constructor(props) {
super(props);
this.state = {
isToggleOn: false
};
}
showDropdown(e) {
e.preventDefault();
this.setState(prevState => ({
isToggleOn: !prevState.isToggleOn
}));
}
render() {
const classDropdownMenu = 'dropdown-menu' + (this.state.isToggleOn ? ' show' : '')
return (
<li className="nav-item dropdown">
<a className="nav-link dropdown-toggle" href="/" id="navbarDropdown" role="button" data-toggle="dropdown"
aria-haspopup="true" aria-expanded="false"
onClick={(e) => {this.showDropdown(e)}}>
{this.props.name}
</a>
<div className={classDropdownMenu} aria-labelledby="navbarDropdown">
{this.props.children}
</div>
</li>
)
}
}
class Navigation extends React.Component {
render() {
return (
<nav className="navbar navbar-expand-lg navbar-dark bg-dark">
<a className="navbar-brand" href="/">Navbar</a>
<button className="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
<span className="navbar-toggler-icon"></span>
</button>
<div className="collapse navbar-collapse" id="navbarSupportedContent">
<ul className="navbar-nav mr-auto">
<NavItem path="/" name="Home" />
<NavItem path="/page2" name="Page2" />
<NavItem path="/page3" name="Disabled" disabled="true" />
<NavDropdown name="Dropdown">
<a className="dropdown-item" href="/">Action</a>
<a className="dropdown-item" href="/">Another action</a>
<div className="dropdown-divider"></div>
<a className="dropdown-item" href="/">Something else here</a>
</NavDropdown>
</ul>
<form className="form-inline my-2 my-lg-0">
<input className="form-control mr-sm-2" type="search" placeholder="Search" aria-label="Search" />
<button className="btn btn-outline-success my-2 my-sm-0" type="submit">Search</button>
</form>
</div>
</nav>
)
}
}
export default Navigation;
\ No newline at end of file
import React from 'react';
import BarChartPopUp from '../charts/BarChartPopUP1';
import * as d3 from 'd3';
import {draw} from '../charts/BarChartPopUpAsignatura';
class PopUpAsignatura extends React.Component {
constructor(props){
super(props);
this.state = {
style: {
top: 0,
left: 0
}
}
}
componentDidUpdate(){
var popup = document.getElementsByClassName('popup_inner')[0];
console.log(popup+ " "+document.getElementsByClassName('popup_inner').length);
if(popup!=undefined){
var data=popup.getBoundingClientRect();
let position = this.props.popUpPos;
console.log("Este es el famoso top "+data.top+" "+popup.offsetHeight+" "+position.centroX);
if(position.centroX!=undefined){
//console.log("holap");
//encuentro el centro del popup
var mitadX = popup.offsetWidth / 2;//el ancho del popup para dos
var mitadY = popup.offsetHeight / 2; //el alto del popup para dos
//para el aldo izquierdo
var posX = position.centroX - mitadX; //resto..el centro del div de la materia menos la mitad del ancho del popup, me da la posicion en x en la que se debe ubicar
//para el lado de arriba (top)
var posY = position.centroY - mitadY; //resto..el centro del div de la materia menos la mitad del largo del popup, me da la posicion en y en la que se debe ubicar
//para el aldo derecho
var posXr = position.centroX + mitadX;
//para el lado de abajo(bottom)
var posYb = position.centroY + mitadY;
//ahora comparo que no se salga del div el popup, para ello comparo los lados izquierdo, arriba, derecho y abajo que no se exeda
if(posX<position.MinimoX){
posX = position.MinimoX; //si es menor al minimo en x, entonces toma el valor del minimo
}
if(posXr > position.MaximoX){
posX = position.MaximoX - popup.offsetWidth; //si es mayor al maximo en x, entonces toma el valor del maximo menos el ancho del componente popup
}
if(posY < position.MinimoY){
posY = position.MinimoY; //si es menor al minimo en y, entonces toma el valor del minimo
}
if(posYb > position.MaximoY){
posY = position.MaximoY - popup.offsetHeight; //si es mayor al maximo en y, entonces toma el valor del maximo menos el largo del componente popup
}
// console.log(position.centroY+" centroX: "+position.centroX+" mitadY: "+mitadY+" mitadX: "+mitadX+" posXr: "+posXr+" posyb: "+posYb);
this.update(posX, posY);
draw(this.props.datagraph, this.props.position);
}
}
}
//creo este metodo para que despues que se haya creado este elemnto, es decir el popup, se ejecute este
//metodo y pueda actualizar la posicion del pop up, eso solo sucede cuando uso bootstrap, pues
///si no uso este metodo no se muestra el popup
componentWillMount(){
var popup = document.getElementsByClassName('popup_inner')[0];
// console.log(popup+ " "+document.getElementsByClassName('popup_inner').length);
if(popup!=undefined){
var data=popup.getBoundingClientRect();
let position = this.props.popUpPos;
// console.log("Este es el famoso top "+data.top+" "+popup.offsetHeight+" "+position.centroX);
if(position.centroX!=undefined){
//console.log("holap");
//encuentro el centro del popup
var mitadX = popup.offsetWidth / 2;//el ancho del popup para dos
var mitadY = popup.offsetHeight / 2; //el alto del popup para dos
//para el aldo izquierdo
var posX = position.centroX - mitadX; //resto..el centro del div de la materia menos la mitad del ancho del popup, me da la posicion en x en la que se debe ubicar
//para el lado de arriba (top)
var posY = position.centroY - mitadY; //resto..el centro del div de la materia menos la mitad del largo del popup, me da la posicion en y en la que se debe ubicar
//para el aldo derecho
var posXr = position.centroX + mitadX;
//para el lado de abajo(bottom)
var posYb = position.centroY + mitadY;
//ahora comparo que no se salga del div el popup, para ello comparo los lados izquierdo, arriba, derecho y abajo que no se exeda
if(posX<position.MinimoX){
posX = position.MinimoX; //si es menor al minimo en x, entonces toma el valor del minimo
}
if(posXr > position.MaximoX){
posX = position.MaximoX - popup.offsetWidth; //si es mayor al maximo en x, entonces toma el valor del maximo menos el ancho del componente popup
}
if(posY < position.MinimoY){
posY = position.MinimoY; //si es menor al minimo en y, entonces toma el valor del minimo
}
if(posYb > position.MaximoY){
posY = position.MaximoY - popup.offsetHeight; //si es mayor al maximo en y, entonces toma el valor del maximo menos el largo del componente popup
}
// console.log(position.centroY+" centroX: "+position.centroX+" mitadY: "+mitadY+" mitadX: "+mitadX+" posXr: "+posXr+" posyb: "+posYb);
this.update(posX, posY);
}
}
}
update(posX, posY){
//console.log("Estas son las coordenadas: x: "+posX+" y: "+posY+" "+this.state.style.top);
//console.log(this.props.position);
d3.select(".popup_inner")
.style('top', posY+'px')
.style('left', posX+'px');
// let coors = posY + 5;
// let coorsm = posY - 5;
// if(this.state.style.top !== posY || this.state.style.top >= coors || this.state.style.top <= coorsm){
// this.setState({style: {top: posY, left: posX}});
// }
}
render(){
return (
<div className='popup'>
<div className='popup_inner' style={this.state.style} >
<span className="close glyphicon glyphicon-remove close-alert" onClick={this.props.closePopup}></span>
<div className="contentPopLittle" onClick={this.props.closePopupOpenGrow}>
<div className="asignaturaTitulo"><h3 className="h5Descripcion">{this.props.asignatura}</h3></div>
{/*<button onClick={this.props.closePopup}>close me</button>
<h1>holaaaaa</h1>*/}
<div className="containersvg"></div>
<div className={this.props.aprobacion+" base-little"}>{this.props.grades.length ? this.props.grades : ''}</div>
</div>
}
</div>
</div>
);
}
}
export default PopUpAsignatura;
\ No newline at end of file
import React from 'react';
import PopUpNotasComparadasGrow from '../charts/BarChartPopUpNotasComparadasCompaneros';
class PopUpAdignaturaGrow extends React.Component{
constructor(props){
super(props);
this.state = {
style: {
top: 0,
left: 0
}
}
}
componentDidMount(){
this.setState({style: {top:0, left:0}});
//console.log(this.state.style+" "+document.getElementsByClassName("popup_inner_grow")[0]);
var popup = document.getElementsByClassName('popup_inner_grow')[0];
var data=popup.getBoundingClientRect();
let position = this.props.popUpPos;
//console.log("Este es el famoso top "+data.top+" "+popup.offsetHeight+" "+position.centroX);
if(position.centroX!=undefined){
//console.log("holap");
//encuentro el centro del popup
var mitadX = popup.offsetWidth / 2;//el ancho del popup para dos
var mitadY = popup.offsetHeight / 2; //el alto del popup para dos
//para el aldo izquierdo
var